DORMANTno replies

[PATCH] Fixed a translation error(die(_()) function)

From: Alangi Derick <hidden>
Date: 2016-06-15 23:04:38
Subsystem: the rest · Maintainer: Linus Torvalds

Signed-off-by: Alangi Derick <redacted>
---
 advice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/advice.c b/advice.c
index 575bec2..a8b2909 100644
--- a/advice.c
+++ b/advice.c
@@ -93,7 +93,7 @@ int error_resolve_conflict(const char *me)
 void NORETURN die_resolve_conflict(const char *me)
 {
 	error_resolve_conflict(me);
-	die("Exiting because of an unresolved conflict.");
+	die(_("Exiting because of an unresolved conflict."));
 }
 
 void detach_advice(const char *new_name)
-- 
2.4.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help