summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-29 15:40:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-29 15:40:33 -0700
commita2dc04ba159def766ee17db00c60bdbda477955d (patch)
tree961c12266b9374cd9eaa40b668ad3b897845d99c /t/t7601-merge-pull-config.sh
parentMerge branch 'maint-1.6.1' into maint (diff)
parentMerge branch 'maint-1.6.0' into maint-1.6.1 (diff)
downloadtgif-a2dc04ba159def766ee17db00c60bdbda477955d.tar.xz
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: diff -c -p: do not die on submodules
Diffstat (limited to 't/t7601-merge-pull-config.sh')
0 files changed, 0 insertions, 0 deletions