make mergebranch executable
treec7432abc2e71164fa34140b7b8be8c0936f8c84b
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh