| commit | 4ce498baa3976cf96d3feb4215a486dd47ec2e7b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Dec 2021 17:39:47 +0000 (15 09:39 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Dec 2021 17:39:47 +0000 (15 09:39 -0800) | ||
| tree | 6461c3669e41cebaf33f124d5964c06072803187 | treesnapshot (tar.gz zip) |
| parent | 62329d336f5d427d8f08035798bf62cd7d8fd847 | commitdiff |
| parent | ddfc44a898a58311392a5329687a1813d6b94779 | commitdiff |
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"
"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"
| Documentation/git-checkout.txt | diff1 | diff2 | blobhistory |
| builtin/checkout.c | diff1 | diff2 | blobhistory |
| contrib/completion/git-completion.bash | diff1 | diff2 | blobhistory |