1. 20 Mar, 2014 2 commits
  2. 25 Jan, 2014 1 commit
  3. 20 Jan, 2014 1 commit
    • 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
  4. 14 Nov, 2013 1 commit
  5. 29 Jun, 2013 1 commit
  6. 15 May, 2013 1 commit
  7. 30 Apr, 2013 1 commit