diff-files -c/--cc: combine only when both ours and theirs exist.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: 939aabbf7d108b5d6830bf5cd89abc910cc9ff27)
-rw-r--r-- 879 pack-protocol.txt
-rw-r--r-- 4246 trivial-merge.txt