summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-02 15:47:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-02 15:47:33 -0700
commit6bf931a54fd66826f28d2808b7ad822024764d41 (patch)
treedea45a52806f8cc4d0f6c41d1ffdc54b7e008f7e /merge.c
parentSync with maint (diff)
parentcompletion: zsh: improve bash script loading (diff)
downloadtgif-6bf931a54fd66826f28d2808b7ad822024764d41.tar.xz
Merge branch 'fc/zsh-leftover-bits'
* fc/zsh-leftover-bits: completion: zsh: improve bash script loading completion: synchronize zsh wrapper completion: cleanup zsh wrapper
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions