Merge branch 'bc/asciidoc-pretty-formats-fix'

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