- 06 Mar, 2014 1 commit
-
-
Ben Straub committed
-
- 05 Feb, 2014 2 commits
-
-
Ben Straub committed
-
Ben Straub committed
-
- 04 Feb, 2014 3 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
- 03 Feb, 2014 1 commit
-
-
Ben Straub committed
-
- 25 Jan, 2014 2 commits
-
-
Following the rest of the series, use 'id' when refering to the value.
Carlos Martín Nieto committed -
This was not converted when we converted the rest, so do it now.
Carlos Martín Nieto committed
-
- 20 Jan, 2014 7 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
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 -
Edward Thomson committed
-
Edward Thomson committed
-
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 Jan, 2014 1 commit
-
-
Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters.
Carlos Martín Nieto committed
-
- 09 Dec, 2013 1 commit
-
-
Edward Thomson committed
-
- 03 Dec, 2013 1 commit
-
-
Edward Thomson committed
-
- 14 Nov, 2013 1 commit
-
-
Ben Straub committed
-