An updated interface for solving edit conflicts is now available. Enable the Paragraph-based Edit Conflict Interface in your preferences to try it out.
An updated interface for solving edit conflicts is now available. Enable the Paragraph-based Edit Conflict Interface in your preferences to try it out.
