X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=wt-status.c;h=b191c65382b0714978fe1a6351639ed746db099f;hb=51f11d69b16ab6614b79b3b4c12d35ca2b450a22;hp=438a40d63739d9397829e83d7af241054f729235;hpb=43f25ae7b8e02d224fd150cf365b28d1956cc8cf;p=~andy%2Fgit diff --git a/wt-status.c b/wt-status.c index 438a40d63..b191c6538 100644 --- a/wt-status.c +++ b/wt-status.c @@ -826,7 +826,7 @@ static void show_am_in_progress(struct wt_status *s, if (advice_status_hints) { if (!state->am_empty_patch) status_printf_ln(s, color, - _(" (fix conflicts and then run \"git am --resolved\")")); + _(" (fix conflicts and then run \"git am --continue\")")); status_printf_ln(s, color, _(" (use \"git am --skip\" to skip this patch)")); status_printf_ln(s, color,