Merge branch 'jt/transport-hide-vtable'

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 915591f7d4797ace61761195933ab170c6b70eff..c1937a291126ca5e451763ccdf22bf8cccd0bd42 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -86,6 +86,10 @@ typedef struct s_mmbuffer {
 
 typedef struct s_xpparam {
        unsigned long flags;
+
+       /* See Documentation/diff-options.txt. */
+       char **anchors;
+       size_t anchors_nr;
 } xpparam_t;
 
 typedef struct s_xdemitcb {