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