Merge in master changes before commiting.
treed7bde77bb060d4345c0d7106429c72cade7ec724
-rwxr-xr-x 381 changebranch
-rwxr-xr-x 587 commitbranch
-rwxr-xr-x 67 currentbranchname
-rwxr-xr-x 568 cvs2git-modmerge.sh
-rw-r--r-- 408 mergebranch
-rwxr-xr-x 315 newbranch
-rwxr-xr-x 803 rebasebranch
-rwxr-xr-x 76 updatebranch