summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-28 00:46:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-28 00:46:25 -0700
commit2254da06a5473ffde973337bad2c6a96eea61e20 (patch)
treec7b1bf0ba4094dbc3e6f209e379a15b66d6864aa /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-2254da06a5473ffde973337bad2c6a96eea61e20.tar.xz
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message
Diffstat (limited to 't/t7601-merge-pull-config.sh')
0 files changed, 0 insertions, 0 deletions