Merge branch 'master' of git://github.com/git-l10n/git-po

diff --git a/merge-recursive.h b/merge-recursive.h
index fa7bc6b6836f99ab9c417e2865cd5a544488d025..e6a0828ecacd81d820feb8caa07c90707e97f8b4 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -1,8 +1,10 @@
 #ifndef MERGE_RECURSIVE_H
 #define MERGE_RECURSIVE_H
 
-#include "unpack-trees.h"
 #include "string-list.h"
+#include "unpack-trees.h"
+
+struct commit;
 
 struct merge_options {
        const char *ancestor;
@@ -18,6 +20,7 @@ struct merge_options {
        unsigned renormalize : 1;
        long xdl_opts;
        int verbosity;
+       int detect_directory_renames;
        int diff_detect_rename;
        int merge_detect_rename;
        int diff_rename_limit;