l10n: de.po: translate "bad" as "ungültig" ("invalid")

diff --git a/merge-recursive.c b/merge-recursive.c
index 318d32e223242b620c5bd43b2af808fa64b788a4..0fb174359ac12ec9dc02078f870f750915557725 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -485,6 +485,7 @@ static struct string_list *get_renames(struct merge_options *o,
        renames = xcalloc(1, sizeof(struct string_list));
        diff_setup(&opts);
        DIFF_OPT_SET(&opts, RECURSIVE);
+       DIFF_OPT_CLR(&opts, RENAME_EMPTY);
        opts.detect_rename = DIFF_DETECT_RENAME;
        opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
                            o->diff_rename_limit >= 0 ? o->diff_rename_limit :