diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-27 08:11:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 08:11:41 (GMT) |
| commit | 05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5 (patch) | |
| tree | 1312b104cc48f5c06c74fbf5d03ffa95e5a3f618 /t | |
| parent | 1d73f8e86d7b4d95e0b7ce53eec2a5f8114722ac (diff) | |
| parent | c7d227df5bf7fe9d5df98a55cd637bfaf38685ea (diff) | |
| download | git-05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5.zip git-05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5.tar.gz git-05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5.tar.bz2 | |
Merge branch 'cp/merge-continue'
"git merge --continue" has been added as a synonym to "git commit"
to conclude a merge that has stopped due to conflicts.
* cp/merge-continue:
merge: mark usage error strings for translation
merge: ensure '--abort' option takes no arguments
completion: add --continue option for merge
merge: add '--continue' option as a synonym for 'git commit'
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 85248a1..2ebda50 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -154,6 +154,10 @@ test_expect_success 'test option parsing' ' test_must_fail git merge -s foobar c1 && test_must_fail git merge -s=foobar c1 && test_must_fail git merge -m && + test_must_fail git merge --abort foobar && + test_must_fail git merge --abort --quiet && + test_must_fail git merge --continue foobar && + test_must_fail git merge --continue --quiet && test_must_fail git merge ' @@ -763,4 +767,11 @@ test_expect_success 'merge nothing into void' ' ) ' +test_expect_success 'merge can be completed with --continue' ' + git reset --hard c0 && + git merge --no-ff --no-commit c1 && + git merge --continue && + verify_parents $c0 $c1 +' + test_done |