diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 942ddbbf0eca9e..a9b435b5e3511c 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -37,7 +37,7 @@ test_expect_success 'M/D conflict does not segfault' ' cat >expect <expected <<\EOF && On branch main You have unmerged paths. - (fix conflicts and run "git commit") + (fix conflicts and run "git merge --continue") (use "git merge --abort" to abort the merge) Unmerged paths: @@ -174,7 +174,7 @@ test_expect_success 'status when conflicts with add and rm advice (both deleted) cat >expected <<\EOF && On branch conflict_second You have unmerged paths. - (fix conflicts and run "git commit") + (fix conflicts and run "git merge --continue") (use "git merge --abort" to abort the merge) Unmerged paths: @@ -198,7 +198,7 @@ test_expect_success 'status when conflicts with only rm advice (both deleted)' ' cat >expected <<\EOF && On branch conflict_second You have unmerged paths. - (fix conflicts and run "git commit") + (fix conflicts and run "git merge --continue") (use "git merge --abort" to abort the merge) Changes to be committed: diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index aca4b6d33262df..f2e712ac395fab 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -31,7 +31,7 @@ test_expect_success 'status when conflicts unresolved' ' cat >expected <<\EOF && On branch conflicts You have unmerged paths. - (fix conflicts and run "git commit") + (fix conflicts and run "git merge --continue") (use "git merge --abort" to abort the merge) Unmerged paths: @@ -53,7 +53,7 @@ test_expect_success 'status when conflicts resolved before commit' ' cat >expected <<\EOF && On branch conflicts All conflicts fixed but you are still merging. - (use "git commit" to conclude merge) + (use "git merge --continue" to conclude the merge) Changes to be committed: modified: main.txt diff --git a/wt-status.c b/wt-status.c index 57772c7501fdba..238bb4864397a3 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1273,7 +1273,7 @@ static void show_merge_in_progress(struct wt_status *s, status_printf_ln(s, color, _("You have unmerged paths.")); if (s->hints) { status_printf_ln(s, color, - _(" (fix conflicts and run \"git commit\")")); + _(" (fix conflicts and run \"git merge --continue\")")); status_printf_ln(s, color, _(" (use \"git merge --abort\" to abort the merge)")); } @@ -1282,7 +1282,7 @@ static void show_merge_in_progress(struct wt_status *s, _("All conflicts fixed but you are still merging.")); if (s->hints) status_printf_ln(s, color, - _(" (use \"git commit\" to conclude merge)")); + _(" (use \"git merge --continue\" to conclude the merge)")); } wt_longstatus_print_trailer(s); }