Dont rebase if you dont commit!
tree2f6e7a11f2d0f85be57ca9871f0e645386503667
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh