From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 23 Jul 2021 15:57:01 GMT
Subject: RE: [PATCH 1/4] merge: add missing word "strategy" to a message
Message-ID: <60fae6cdadd2_defb20872@natae.notmuch>
In-Reply-To: <85016e679eb77cbb17edc9b6849251893a5e9ec2.1627042470.git.gitgitgadget@gmail.com>

Philippe Blain via GitGitGadget wrote:
> From: Philippe Blain <levraiphilippeblain@gmail.com>
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -1715,7 +1715,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
>  	else {
>  		printf(_("Rewinding the tree to pristine...\n"));
>  		restore_state(&head_commit->object.oid, &stash);
> -		printf(_("Using the %s to prepare resolving by hand.\n"),
> +		printf(_("Using the %s strategy to prepare resolving by hand.\n"),

Obviously correct.

-- 
Felipe Contreras