diff-merges: let new options enable diff without -p
[git] / t / t4211 /
drwxr-xr-x   ..
-rw-r--r-- 5213 history.export
drwxr-xr-x - sha1
drwxr-xr-x - sha256