git-pull doc: fix grammo ("conflicts" is plural)
[gitweb.git] / t / t9121 /
drwxr-xr-x   parent (dest: t; base: 38ef8a76e7c8c3e1be6e6ae96cfccc4191e9eac8)
-rw-r--r-- 1046 renamed-dir.dump