delta/libgit2.git/src/merge_file.h, branch cmn/oidarray github.com: libgit2/libgit2.git Introduce git_merge_file for consumers 2014-03-20T16:25:05+00:00 Edward Thomson ethomson@edwardthomson.com 2014-03-11T06:30:41+00:00 05d47768caf6fec51fa85cb6275c9ba8324aead6 






Introduce diff3 mode for checking out conflicts
2014-01-20T22:15:13+00:00

Edward Thomson
ethomson@microsoft.com

2014-01-19T23:05:08+00:00

e651e8e2b5c5eb021448fb0f0a36cb3f10fa9326












merge_file should use more aggressive levels
2014-01-20T22:15:11+00:00

Edward Thomson
ethomson@microsoft.com

2014-01-09T02:29:42+00:00

c1d648c5c6361edfb1aa85a31656b628672c7616

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.





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.







Fix trailing whitespaces
2013-05-15T20:41:30+00:00

nulltoken
emeric.fermas@gmail.com

2013-05-13T19:57:37+00:00

1fed6b07f0722c8b4349ff3709a49df3d3c9ae61












merge!
2013-04-30T20:31:31+00:00

Edward Thomson
ethomson@microsoft.com

2013-04-02T03:16:21+00:00

bec65a5e994bc4701216c9ca2c7dae83770b3edc