diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 7b5db8066f..0919ec46f6 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -32,7 +32,7 @@ cat >expect <..." to unstage) -# (use "git add ..." to mark resolution) +# (use "git add/rm ..." as appropriate to mark resolution) # # deleted by us: foo # diff --git a/wt-status.c b/wt-status.c index 3fdcf97e11..56cd8741c0 100644 --- a/wt-status.c +++ b/wt-status.c @@ -52,7 +52,7 @@ static void wt_status_print_unmerged_header(struct wt_status *s) color_fprintf_ln(s->fp, c, "# (use \"git reset %s ...\" to unstage)", s->reference); else color_fprintf_ln(s->fp, c, "# (use \"git rm --cached ...\" to unstage)"); - color_fprintf_ln(s->fp, c, "# (use \"git add ...\" to mark resolution)"); + color_fprintf_ln(s->fp, c, "# (use \"git add/rm ...\" as appropriate to mark resolution)"); color_fprintf_ln(s->fp, c, "#"); }