combine-diff: move formatting logic to show_combined_diff()
[git.git] / Documentation / technical /
drwxr-xr-x   ..
-rw-r--r-- 879 pack-protocol.txt
-rw-r--r-- 4246 trivial-merge.txt