rebase: show consistent conflict resolution hint
When rebase stops due to conflict, interactive rebase currently displays a different hint to the user than non-interactive rebase does. Use the same message for both types of rebase. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin von Zweigbergk committed
Feb 6, 2011 at 13:43 UTC
89c7ae9c3bffe599b46a18a9a504fd3e28a9e715
1 file changed
+1
-3
git-rebase--interactive.sh
+1
-3
@@ -81,9 +81,7 @@ amend="$dotest"/amend
81
rewritten_list="$dotest"/rewritten-list
82
rewritten_pending="$dotest"/rewritten-pending
83
84
-GIT_CHERRY_PICK_HELP="\
85
-hint: after resolving the conflicts, mark the corrected paths
86
-hint: with 'git add <paths>' and run 'git rebase --continue'"
84
+GIT_CHERRY_PICK_HELP="$resolvemsg"
85
export GIT_CHERRY_PICK_HELP
86
87
warn () {