Make sure rebasing works when there are new local and remote commits, but is skipped...
treefe10c104fe114baffc8c02c8e15024f24f7fc4fd
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh