- 28 May, 2014 1 commit
-
-
Carlos Martín Nieto committed
-
- 20 Mar, 2014 1 commit
-
-
Edward Thomson committed
-
- 20 Jan, 2014 2 commits
-
-
Edward Thomson committed
-
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.
Edward Thomson committed
-
- 15 May, 2013 1 commit
-
-
nulltoken committed
-
- 30 Apr, 2013 1 commit
-
-
Edward Thomson committed
-