summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-27 17:28:31 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-27 17:28:31 -0700
commita1184d85e8752658f02746982822f43f32316803 (patch)
treef4508ca7d63ca7e71c3e99cac4e54945f777b1aa /t/t7600-merge.sh
parent8d13caf795902812d44809e2f222fb2334030603 (diff)
parente596cdddf349b244dca854bf5a7aa9428b48fc50 (diff)
downloadgit-a1184d85e8752658f02746982822f43f32316803.tar.gz
Merge branch 'mv/merge-custom'
* mv/merge-custom: t7606: fix custom merge test Fix "git-merge -s bogo" help text Update .gitignore to ignore git-help Builtin git-help. builtin-help: always load_command_list() in cmd_help() Add a second testcase for handling invalid strategies in git-merge Add a new test for using a custom merge strategy builtin-merge: allow using a custom strategy builtin-help: make some internal functions available to other builtins Conflicts: help.c
Diffstat (limited to 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index dbc90bc416..6a2b12558a 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -230,6 +230,10 @@ test_expect_success 'test option parsing' '
test_must_fail git merge
'
+test_expect_success 'reject non-strategy with a git-merge-foo name' '
+ test_must_fail git merge -s index c1
+'
+
test_expect_success 'merge c0 with c1' '
git reset --hard c0 &&
git merge c1 &&