Junio C Hamano 4ce498baa3 Merge branch 'en/zdiff3' ... "Zealous diff3" style of merge conflict presentation has been added. * en/zdiff3: update documentation for new zdiff3 conflictStyle xdiff: implement a zealous diff3, or "zdiff3"		2021-12-15 09:39:47 -08:00
..
.gitignore
api-error-handling.txt
api-index-skel.txt
api-index.sh
api-merge.txt
api-parse-options.txt
api-simple-ipc.txt
api-trace2.txt	trace2: increment event format version	2021-11-11 15:01:04 -08:00
bitmap-format.txt
bundle-format.txt
chunk-format.txt
commit-graph-format.txt
commit-graph.txt
directory-rename-detection.txt
hash-function-transition.txt
http-protocol.txt
index-format.txt
long-running-process-protocol.txt
multi-pack-index.txt	Merge branch 'jt/midx-doc-fix'	2021-12-10 14:35:13 -08:00
pack-format.txt
pack-heuristics.txt
pack-protocol.txt
packfile-uri.txt
parallel-checkout.txt
partial-clone.txt
protocol-capabilities.txt
protocol-common.txt
protocol-v2.txt	Merge branch 'cw/protocol-v2-doc-fix'	2021-12-10 14:35:00 -08:00
racy-git.txt
reftable.txt
remembering-renames.txt
repository-version.txt
rerere.txt	update documentation for new zdiff3 conflictStyle	2021-12-01 14:45:59 -08:00
send-pack-pipeline.txt
shallow.txt
signature-format.txt	signature-format.txt: explain and illustrate multi-line headers	2021-10-12 19:06:24 -07:00
sparse-index.txt
trivial-merge.txt