Patch Set 1: I would prefer that you didn't submit this

We spent a lot of time in writing the ResolveMerger and also add ton's of unit tests for that algorithm. Therefore I am
hoping that we can reuse the ResolveMerger instead of duplicating the code. I looked at the proposal and at least from my investigation it is a copy of ResolveMerge where all references to WorkDir are removed, right?

So, what do you think, wouldn't it be possible to just add some parameter to ResolveMerger constructors ignore the workdir? The mainloop of the merge algorithm would get one additional if - performance should not be a problem here.