Jiang Xin <worldhello.net@xxxxxxxxx> writes: > @@ -249,14 +249,14 @@ struct tree *write_tree_from_memory(struct merge_options *o) > > if (unmerged_cache()) { > int i; > - fprintf(stderr, "BUG: There are unmerged index entries:\n"); > + fprintf(stderr, _("BUG: There are unmerged index entries:\n")); Micronit. "BUG:" entries are only to help Git developers to locate the exact codepath that is buggy, and I think it is better left untranslated. > + if (NULL == renamed) { Better written as "if (!renamed)". -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html