[Patch] Fixed translation error in advice.c

From d0928311adf2c6ee03b3c2a2b451db704bce6d6b Mon Sep 17 00:00:00 2001

From: Alangi Derick <redacted>
Date: Sun, 3 May 2015 19:30:13 +0100
Subject: [PATCH] Fixed a translation error(die(_()) function)

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