Documentation/git-merge-file: document option "--diff3"
[git] / t / t5004 /
drwxr-xr-x   ..
-rw-r--r-- 10240 empty-with-pax-header.tar
-rw-r--r-- 62 empty.zip