mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
![]() "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" |
||
---|---|---|
.. | ||
.gitattributes | ||
git-completion.bash | ||
git-completion.tcsh | ||
git-completion.zsh | ||
git-prompt.sh |