diff options
Diffstat (limited to 'src/merge_file.c')
| -rw-r--r-- | src/merge_file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/merge_file.c b/src/merge_file.c index 7285884b4..732a047b1 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -123,6 +123,8 @@ static int merge_file__xdiff( if (options.flags & GIT_MERGE_FILE_STYLE_DIFF3) xmparam.style = XDL_MERGE_DIFF3; + if (options.flags & GIT_MERGE_FILE_STYLE_ZDIFF3) + xmparam.style = XDL_MERGE_ZEALOUS_DIFF3; if (options.flags & GIT_MERGE_FILE_IGNORE_WHITESPACE) xmparam.xpp.flags |= XDF_IGNORE_WHITESPACE; |