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

..

.gitattributes

…

git-completion.bash

Merge branch 'en/zdiff3'

2021-12-15 09:39:47 -08:00

git-completion.tcsh

completion: tcsh: Fix regression by drop of wrapper functions

2021-08-18 13:58:27 -07:00

git-completion.zsh

contrib/completion: fix zsh completion regression from 59d85a2a05

2021-06-02 12:49:40 +09:00

git-prompt.sh

git-prompt: work under set -u

2021-05-13 15:50:26 +09:00