Try to only bail rebase if there is no diff
treec8389c4d40eec088664a9790f71f402aa9427fcc
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh