More descriptive merging comments
tree059e21e01c7875c789d109f270903c07ba09531a
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh