Documentation/git-merge-file: document option "--diff3"
[git] / contrib / vim /
drwxr-xr-x   ..
-rw-r--r-- 855 README