delta/libgit2.git/tests/merge/trees/automerge.c, branch cmn/https-cap-no-hardcode github.com: libgit2/libgit2.git merge tests: move expected data into own file 2015-11-25T20:38:22+00:00 Edward Thomson ethomson@edwardthomson.com 2015-11-09T13:23:27+00:00 dcde5720424961f526e8c070b7d99191d7ef75c1 






Update git_merge_tree_opts to git_merge_options
2014-03-20T16:25:08+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-12T05:47:39+00:00

5aa2ac6de1622308884fd542f7b29e6810a0e98e












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












index: rename an entry's id to 'id'
2014-01-25T07:15:44+00:00

Carlos Martín Nieto
cmn@dwim.me

2014-01-24T10:36:41+00:00

d541170c77b7ac738e2ffcdd04c838fb7cbbfb87

This was not converted when we converted the rest, so do it now.





This was not converted when we converted the rest, so do it now.







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.







Rename tests-clar to tests
2013-11-14T22:05:52+00:00

Ben Straub
bs@github.com

2013-11-14T22:05:52+00:00

1782038144ef3413831801bb9c2f3038a84ac6f4