diff options
Diffstat (limited to 'src')
| -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 fb0e29960..9961ef297 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -156,6 +156,8 @@ int git_merge_files( xmparam.favor = XDL_MERGE_FAVOR_OURS; else if (opts && opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) xmparam.favor = XDL_MERGE_FAVOR_THEIRS; + else if (opts && opts->favor == GIT_MERGE_FILE_FAVOR_UNION) + xmparam.favor = XDL_MERGE_FAVOR_UNION; xmparam.level = (opts && (opts->flags & GIT_MERGE_FILE_SIMPLIFY_ALNUM)) ? |