Fix script loosing the actual merge line after the recent changes moved things around
tree2723f49f1da37a9cda62489052a1a62985b88636
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh