Edward Thomson c1d648c5c6 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.		2014-01-20 17:15:11 -05:00
..
0a	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
0c	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
0f	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
1b	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
1f	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
2d	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
3a	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
4b	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
5a	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
5c	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
6b	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
8f	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
9a	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
13	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
15	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
18	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
21	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
29	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
33	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
39	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
46	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
52	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
55	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
71	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
72	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
73	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
74	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
77	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
83	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
87	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
97	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
a6	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
a8	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
ac	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
b6	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
b7	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
be	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
ca	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
ce	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
d1	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
dd	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
de	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
e3	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
ea	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
eb	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
ee	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
f4	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00