Merge in dirty changes more safely
tree4e3c7ede9707d869f6d474bbbba324175dbacf8b
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh