Handle rebase cases more properly
treeef9de7c1391b709d19a770b4a24771f7e9936fe1
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh