pull: allow pull to preserve merges when rebasing
[git] / t / t9601 / cvsroot / CVSROOT /
drwxr-xr-x   ..
-rw-r--r-- 17 .gitignore