Scrollone, 8 months ago I think Sublime Merge does this with the conflict resolution tool
I think Sublime Merge does this with the conflict resolution tool