Bug during merge

[Jens Odborg]

If I select several files that conflict then right click and select resolve using mine. One of two errors happens:

case 1: when all files are in different folders only the first are resolved even though I was asked to confirm them all

case 2: when some files are in same folder I get an error (after confirmation) that a file fails because it is open by another application even though this was not the case, and no files are resolved. (I suspect that the other application was started by SourceTree)