merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / t / t7500 /
drwxr-xr-x   parent (dest: t; base: b26d87f2da22a5970b15bebe588bcd6ccac98e9b)
-rwxr-xr-x 88 add-comments
-rwxr-xr-x 47 add-content
-rwxr-xr-x 73 add-content-and-comment
-rwxr-xr-x 63 add-signed-off
-rwxr-xr-x 76 add-whitespaced-content
-rwxr-xr-x 77 edit-content