]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 62329d3 ddfc44a)
Merge branch 'en/zdiff3'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:47 +0000 (09:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:47 +0000 (09:39 -0800)
commit4ce498baa3976cf96d3feb4215a486dd47ec2e7b
tree6461c3669e41cebaf33f124d5964c06072803187tree | snapshot
parent62329d336f5d427d8f08035798bf62cd7d8fd847commit | diff
parentddfc44a898a58311392a5329687a1813d6b94779commit | diff
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"
Documentation/git-checkout.txt diff1 | diff2 | blob | history
builtin/checkout.c diff1 | diff2 | blob | history
contrib/completion/git-completion.bash diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.