Fixup merge script
treee3207ea4f1e5c44febfc2ddc29985ff48f31f8d7
-rwxr-xr-x 381 changebranch
-rwxr-xr-x 584 commitbranch
-rwxr-xr-x 67 currentbranchname
-rwxr-xr-x 568 cvs2git-modmerge.sh
-rw-r--r-- 285 mergebranch
-rwxr-xr-x 315 newbranch
-rwxr-xr-x 803 rebasebranch
-rwxr-xr-x 76 updatebranch