Commit 216f97e4f68c99c21d57a9196702df1f8f4366d4
2013-09-23T09:47:47
Two-step conflict checkout (load / perform) Move conflict handling into two steps: load the conflicts and then apply the conflicts. This is more compatible with the existing checkout implementation and makes progress reporting more sane.