diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-01 19:41:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 19:41:48 (GMT) |
| commit | 4b9a0deddcc643e5082739e7649ab745faf9e7fc (patch) | |
| tree | ac9a40608c64d557781b130b52b786d21dadb61d /t | |
| parent | 66929c423a83ceb9a81e0a298102bfd155a1689b (diff) | |
| parent | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (diff) | |
| download | git-4b9a0deddcc643e5082739e7649ab745faf9e7fc.zip git-4b9a0deddcc643e5082739e7649ab745faf9e7fc.tar.gz git-4b9a0deddcc643e5082739e7649ab745faf9e7fc.tar.bz2 | |
Merge branch 'kb/am-deprecate-resolved'
Promote "git am --continue" over "git am --resolved" for UI
consistency.
* kb/am-deprecate-resolved:
am: replace uses of --resolved with --continue
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) # |