diff-merges: let new options enable diff without -p
[git] / t / t9136 /
drwxr-xr-x   ..
-rw-r--r-- 2221 svn.dump