Fixed issue #2759: Swapped THEIRS and MINE in cherry-pick conflict dialogs and contex...