summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-10-26 21:39:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-10-26 21:39:03 -0700
commit5a3a484d577d8612f729d64f3a069e63df07ec07 (patch)
treec03bc132009ab94005fae70e10674c5178063b80 /git-merge-resolve.sh
parentMerge branch 'po/sendemail' (diff)
parentcompletion: make compatible with zsh (diff)
downloadtgif-5a3a484d577d8612f729d64f3a069e63df07ec07.tar.xz
Merge branch 'ml/completion-zsh'
* ml/completion-zsh: completion: make compatible with zsh
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions