kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'je/status-merge-specific-help' into jch 

"git status" now suggests to use 'git merge --continue', not 'git commit',
when done with conflicts during a 'git merge'.

* je/status-merge-specific-help:
  status: suggest `git merge --continue`, not `git commit`
jch
Junio C Hamano 2026-10-12 09:25:59 -07:00
parent 8482e47bf9 b6d18b5d68
commit c3551fc217
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t7060-wtstatus.sh
View File

@ -37,7 +37,7 @@ test_expect_success 'M/D conflict does not segfault' '
cat >expect <<EOF &&
On branch side
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:
@ -141,7 +141,7 @@ test_expect_success 'status when conflicts with add and rm advice (deleted by th
cat >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:

4
t/t7512-status-help.sh
View File

@ -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

4
wt-status.c
View File

@ -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);
}