1. 25 Nov, 2015 1 commit
  2. 07 Jul, 2015 1 commit
  3. 16 Mar, 2015 1 commit
  4. 03 Mar, 2015 2 commits
  5. 27 Oct, 2014 1 commit
  6. 03 Aug, 2014 1 commit
  7. 14 Apr, 2014 1 commit
  8. 20 Mar, 2014 1 commit
  9. 06 Mar, 2014 1 commit
  10. 05 Feb, 2014 1 commit
  11. 03 Feb, 2014 1 commit
  12. 20 Jan, 2014 2 commits
    • Remove the "merge none" flag · 0e1ba46c
      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
    • merge_file should use more aggressive levels · c1d648c5
      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
  13. 03 Dec, 2013 2 commits
  14. 02 Dec, 2013 1 commit