merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / t / t7500 /
drwxr-xr-x   parent (dest: t; base: 8daec1df03de7db13d5d551a8b54f32fc6021132)
-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