merge-recursive: leave unmerged entries in the index.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: 28e77a81647584bfbe112f19e12e9952ab0b2fab)
-rw-r--r-- 4246 trivial-merge.txt