diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-01-08 18:29:42 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-01-20 17:15:11 -0500 |
| commit | c1d648c5c6361edfb1aa85a31656b628672c7616 (patch) | |
| tree | f611ff05206f2305c82867514f1e7f22b602c7b7 /src/commit.c | |
| parent | e49c98e6efaa444ed73ac3b8318a693801f93184 (diff) | |
| download | libgit2-c1d648c5c6361edfb1aa85a31656b628672c7616.tar.gz | |
merge_file should use more aggressive levels
The default merge_file level was XDL_MERGE_MINIMAL, which will
produce conflicts where there should not be in the case where
both sides were changed identically. Change the defaults to be
more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively
compress non-conflicts. This matches git.git's defaults.
Increase testing around reverting a previously reverted commit to
illustrate this problem.
Diffstat (limited to 'src/commit.c')
0 files changed, 0 insertions, 0 deletions