merge-recursive: remove ren[12]_other fields from rename_conflict_info
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: 3f9c92ec99222515c6ebac1dc12d0bc3a6d4ae08)
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 34876 t7900-subtree.sh