Junio C Hamano 2b2a8103e2 Merge branch 'en/d-f-conflict-fix' into next ...

* en/d-f-conflict-fix:
  fast-import: Improve robustness when D->F changes provided in wrong order
  fast-export: Fix output order of D/F changes
  merge_recursive: Fix renames across paths below D/F conflicts
  merge-recursive: Fix D/F conflicts
  Add a rename + D/F conflict testcase
  Add additional testcases for D/F conflicts

2010-07-14 14:05:16 -07:00

75 KiB

Raw Blame History

View Raw