diff-merges: let new options enable diff without -p
[git] / t / t9601 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot