When I currently have a merge conflict and want to pick an individual line (or two) from one of the conflicting versions, I need to a manual copy-paste into the result. Is there a more convenient way to do that?
This happens very often in my case and some other tool (BeyondCompare) is able to do this very nicely.