- 27 Oct, 2014 1 commit
-
-
Edward Thomson committed
-
- 03 Aug, 2014 1 commit
-
-
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth committed
-
- 14 Apr, 2014 1 commit
-
-
Jacques Germishuys committed
-
- 20 Mar, 2014 1 commit
-
-
Edward Thomson committed
-
- 06 Mar, 2014 1 commit
-
-
Ben Straub committed
-
- 05 Feb, 2014 1 commit
-
-
Ben Straub committed
-
- 03 Feb, 2014 1 commit
-
-
Ben Straub committed
-
- 20 Jan, 2014 2 commits
-
-
The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
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
-
- 03 Dec, 2013 2 commits
-
-
Oh, MSVC.
Edward Thomson committed -
Edward Thomson committed
-
- 02 Dec, 2013 1 commit
-
-
Edward Thomson committed
-