diff options
| author | Kevin Bracey <kevin@bracey.fi> | 2013-06-26 20:06:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 16:37:12 (GMT) |
| commit | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (patch) | |
| tree | eac0b847a1a57ec6faec225feed4fd76452d0685 /t | |
| parent | 85318f521f6c0b9843d6da12abf67f2de7608431 (diff) | |
| download | git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.zip git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.gz git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.bz2 | |
am: replace uses of --resolved with --continue
git am was previously modified to provide --continue for consistency
with rebase, merge etc, and the documentation changed to showing
--continue as the primary form.
Complete the work by replacing remaining uses of --resolved by
--continue, most notably in suggested command reminders.
Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7512-status-help.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 4f09bec..bd8aab0 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -510,7 +510,7 @@ test_expect_success 'status in an am session: file already exists' ' cat >expected <<-\EOF && # On branch am_already_exists # You are in the middle of an am session. - # (fix conflicts and then run "git am --resolved") + # (fix conflicts and then run "git am --continue") # (use "git am --skip" to skip this patch) # (use "git am --abort" to restore the original branch) # @@ -532,7 +532,7 @@ test_expect_success 'status in an am session: file does not exist' ' cat >expected <<-\EOF && # On branch am_not_exists # You are in the middle of an am session. - # (fix conflicts and then run "git am --resolved") + # (fix conflicts and then run "git am --continue") # (use "git am --skip" to skip this patch) # (use "git am --abort" to restore the original branch) # |