Re: [PATCH 2/5] merge-recursive: porcelain messages for checkout
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 9, 2010, 19:58 UTC
- Message-ID
- <7vhbj34kz8.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1281363602-27856-3-git-send-email-Matthieu.Moy@imag.fr>
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
Show 5 quoted lines
> +void set_porcelain_error_msgs(const char **msgs, const char *cmd)
> {
> + const char *msg;
> + char *tmp;
> + const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";This may have implications to the later i18n effort, but lets ignore it for now. I don't think it will be too bad.