Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
rerere.h: mark string for translation
author
Matthias Ruester
<matthias.ruester@gmail.com>
Sun, 14 Sep 2014 22:40:53 +0000
(
00:40
+0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 15 Sep 2014 18:29:46 +0000
(11:29 -0700)
Signed-off-by: Matthias Ruester <matthias.ruester@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
rerere.h
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
96db324
)
diff --git
a/rerere.h
b/rerere.h
index 4aa06c9a519aa289f177487b41e3f6c5b1213ef4..2956c2edf2f0f88bd9fb15682e31e3478df44a03 100644
(file)
--- a/
rerere.h
+++ b/
rerere.h
@@
-24,6
+24,6
@@
extern void rerere_clear(struct string_list *);
extern void rerere_gc(struct string_list *);
#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
-
"update the index with reused conflict resolution if possible"
)
+
N_("update the index with reused conflict resolution if possible")
)
#endif