Alex Henrie <alexhenrie24@xxxxxxxxx> writes:
> Signed-off-by: Alex Henrie <alexhenrie24@xxxxxxxxx>
> ---
> unpack-trees.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 6bc9512..11c37fb 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
> if (!strcmp(cmd, "checkout"))
> msg = advice_commit_before_merge
> ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
> - "Please commit your changes or stash them before you can switch branches.")
> + "Please commit your changes or stash them before you switch branches.")
I'm not a native speaker, but I think both versions are correct.
I'm OK with the change, though. Dropping something useless is usually a
good thing :-).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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