Make NO_{INET_NTOP,INET_PTON} configured independently

diff --git a/merge-recursive.h b/merge-recursive.h
index be8410ad1803bc10e5dbf74f39eecdfed53469b1..344e47694c1a2561f0c79d59747d49604116e8b7 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -4,12 +4,13 @@
 #include "string-list.h"
 
 struct merge_options {
+       const char *ancestor;
        const char *branch1;
        const char *branch2;
        enum {
                MERGE_RECURSIVE_NORMAL = 0,
                MERGE_RECURSIVE_OURS,
-               MERGE_RECURSIVE_THEIRS,
+               MERGE_RECURSIVE_THEIRS
        } recursive_variant;
        const char *subtree_shift;
        unsigned buffer_output : 1;