merge-recursive: conflicting rename case.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: 724b511d4fb363ebee828ba3992c831ba006444c)
-rw-r--r-- 879 pack-protocol.txt
-rw-r--r-- 4246 trivial-merge.txt