[RFC PATCH 01/35] merge: improve fatal fast-forward message

From

Felipe Contreras <felipe.contreras@gmail.com>

Date

Jul 5, 2021, 12:31 UTC

Message-ID

<20210705123209.1808663-2-felipe.contreras@gmail.com>

In-Reply-To

<20210705123209.1808663-1-felipe.contreras@gmail.com>

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 builtin/merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index a8a843b1f5..05e631229d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1620,7 +1620,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	}
 
 	if (fast_forward == FF_ONLY)
-		die(_("Not possible to fast-forward, aborting."));
+		die(_("unable to fast-forward"));
 
 	if (autostash)
 		create_autostash(the_repository,

-- 
2.32.0.36.g70aac2b1aa