cg-merge - merge a branch to the current tree
cg-merge [-c] [-b BASE_COMMIT] BRANCH_NAME
Takes a parameter identifying the branch to be merged.
You have to examine the tree after the merge and then do cg-commit.
Alternatively, it will just bring the HEAD forward, if your current HEAD is also the merge base.
Parameter specifies the base commit for the merge.
Parameter specifies that you want to have tree merge never autocomitted, but want to review and commit it manually.
Print usage help.
Copyright © Petr Baudis, 2005