Documentation: fix and clarify grammar in git-merge docs.
[gitweb.git] / t / t9115 /
drwxr-xr-x   parent (dest: t; base: b98525e4bf1c3587bc57ad982d616dbe174c6e23)
-rw-r--r-- 1490 funky-names.dump