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

…

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

…

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

…

racy-git.txt

…

reftable.txt

…

remembering-renames.txt

…

repository-version.txt

…

rerere.txt

…

send-pack-pipeline.txt

…

shallow.txt

…

signature-format.txt

…

sparse-index.txt

…

trivial-merge.txt

…