TwoColConflict-desc

Showing a side-by-side edit merge screen for edit conflict resolution