Andrew Wong wrote:
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
> fclose(fp);
> rerere(allow_rerere_auto);
> printf(_("Automatic merge failed; "
> - "fix conflicts and then commit the result.\n"));
> + "fix conflicts and then commit the result.\n"
> + "To abort the merge, use \"git merge --abort\".\n"));
Seems reasonable, but I worry about the command growing too noisy.
Could this be guarded by an advice.<something> setting? (See advice.*
in git-config(1) for what I mean.)
[...]
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -907,6 +907,9 @@ static void show_merge_in_progress(struct wt_status *s,
> status_printf_ln(s, color,
> _(" (use \"git commit\" to conclude merge)"));
> }
> + if (s->hints)
> + status_printf_ln(s, color,
> + _(" (use \"git merge --abort\" to abort the merge)\n"));
Perhaps:
...
_(" (or use \"git merge --abort\" to abort the merge)"));
to clarify that this is an alternative to the advice immediately above.
`status_printf_ln` already prints a newline, so the translated message
shouldn't include an extra one.
Thanks,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html