diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2015-03-09 18:02:52 +0300 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2015-03-16 10:53:27 +0300 |
| commit | 45a86bbfd028a545a71d3e1ea5518d467be8b5aa (patch) | |
| tree | b5a3fdbc7576309927ecb58ea02a9804945516ec /src/merge_file.c | |
| parent | d675982a15388d8c413acda139b4662062cf3286 (diff) | |
Allow for merges with whitespace discrepancies
Diffstat (limited to 'src/merge_file.c')
| -rw-r--r-- | src/merge_file.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/merge_file.c b/src/merge_file.c index ff0364432..b827ca977 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -151,6 +151,13 @@ static int git_merge_file__from_inputs( if (options.flags & GIT_MERGE_FILE_STYLE_DIFF3) xmparam.style = XDL_MERGE_DIFF3; + if (options.whitespace_flags & GIT_MERGE_FILE_IGNORE_WHITESPACE) + xmparam.xpp.flags |= XDF_IGNORE_WHITESPACE; + if (options.whitespace_flags & GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE) + xmparam.xpp.flags |= XDF_IGNORE_WHITESPACE_CHANGE; + if (options.whitespace_flags & GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL) + xmparam.xpp.flags |= XDF_IGNORE_WHITESPACE_AT_EOL; + if ((xdl_result = xdl_merge(&ancestor_mmfile, &our_mmfile, &their_mmfile, &xmparam, &mmbuffer)) < 0) { giterr_set(GITERR_MERGE, "Failed to merge files."); |