diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 20:48:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 20:48:57 (GMT) |
| commit | 001d1160541a6dcfceb82a0a900478e315a129eb (patch) | |
| tree | bf35a1f9ac9be44976dd4e97d4450f98daceb286 /t | |
| parent | 869577e5fe8d4307dd39d2751cf3c5a1896d3426 (diff) | |
| parent | b95e66f507967fdfbf7275a94729fe09aa4b20ca (diff) | |
| download | git-001d1160541a6dcfceb82a0a900478e315a129eb.zip git-001d1160541a6dcfceb82a0a900478e315a129eb.tar.gz git-001d1160541a6dcfceb82a0a900478e315a129eb.tar.bz2 | |
Merge branch 'rt/cherry-pick-continue-advice-in-status'
* rt/cherry-pick-continue-advice-in-status:
wt-status: give better advice when cherry-pick is in progress
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7512-status-help.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index bf08d4e..4f09bec 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -632,7 +632,8 @@ test_expect_success 'status when cherry-picking before resolving conflicts' ' cat >expected <<-\EOF && # On branch cherry_branch # You are currently cherry-picking. - # (fix conflicts and run "git commit") + # (fix conflicts and run "git cherry-pick --continue") + # (use "git cherry-pick --abort" to cancel the cherry-pick operation) # # Unmerged paths: # (use "git add <file>..." to mark resolution) @@ -655,7 +656,8 @@ test_expect_success 'status when cherry-picking after resolving conflicts' ' cat >expected <<-\EOF && # On branch cherry_branch # You are currently cherry-picking. - # (all conflicts fixed: run "git commit") + # (all conflicts fixed: run "git cherry-pick --continue") + # (use "git cherry-pick --abort" to cancel the cherry-pick operation) # # Changes to be committed: # |