diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-01-19 22:36:50 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-01-20 17:15:15 -0500 |
| commit | db3462ce7714e2a6ce23130a7046a77860739e05 (patch) | |
| tree | 73559dd90861c5bbb2ea81ad6be9da9d3756dba6 /src/merge_file.c | |
| parent | 0e1ba46cfbca0eec00d8af713fc2059158685381 (diff) | |
| download | libgit2-db3462ce7714e2a6ce23130a7046a77860739e05.tar.gz | |
Support union merges
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 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)) ? |