diff options
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index a71763ade..6eb5fffde 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -117,6 +117,7 @@ typedef struct s_xmparam { int level; int favor; int style; + const char *ancestor; /* label for orig */ } xmparam_t; #define DEFAULT_CONFLICT_MARKER_SIZE 7 |