summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-18 00:27:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-18 00:28:16 -0800
commit03f94ae9f909952ed5a78917ab319a312889354b (patch)
tree0fd041e8b390bd0d2a960ae629d8e965d363de92 /t/t7601-merge-pull-config.sh
parentcommit, merge: initialize static strbuf (diff)
parentMove 'builtin-*' into a 'builtin/' subdirectory (diff)
downloadtgif-03f94ae9f909952ed5a78917ab319a312889354b.tar.xz
Update jk/maint-strbuf-missing-init to builtin/ rename
Diffstat (limited to 't/t7601-merge-pull-config.sh')
-rwxr-xr-xt/t7601-merge-pull-config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 55aa6b5f27..7ba94ea99b 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='git-merge
+test_description='git merge
Testing pull.* configuration parsing.'