global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-05 22:40:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
1250dff32bff164e10ffdad19c0dcb5ec0db32d1
git/contrib/completion/git-completion.bash
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

76 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink