merge-tree: fix typo in "both changed identically"
[gitweb.git] / t / t7500 /
drwxr-xr-x   parent (dest: t; base: ab5f42422d7e025c3151d91cc5ec0d20b9a80922)
-rwxr-xr-x 88 add-comments
-rwxr-xr-x 47 add-content
-rwxr-xr-x 63 add-signed-off
-rwxr-xr-x 76 add-whitespaced-content
-rwxr-xr-x 77 edit-content