merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / t / interop /
drwxr-xr-x   parent (dest: t; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-rw-r--r-- 328 Makefile
-rw-r--r-- 2764 README
-rwxr-xr-x 614 i0000-basic.sh
-rwxr-xr-x 870 i5500-git-daemon.sh
-rwxr-xr-x 2004 i5700-protocol-transition.sh
-rw-r--r-- 1876 interop-lib.sh