When merging have a single clicke way to resolve all conflicts using one of the contributors
Basically a shortcut to take one of the 3 versions (source, base, destination) as a result one.
Described in more detail in the end of http://www.plasticscm.net/index.php?/topic/1200-exception-during-3-way-merge-when-pasting-big-text/
22
votes
![](https://secure.gravatar.com/avatar/b45fa6cdcd9f48f57db19c1824937823?size=40&default=https%3A%2F%2Fassets.uvcdn.com%2Fpkg%2Fadmin%2Ficons%2Fuser_70-6bcf9e08938533adb9bac95c3e487cb2a6d4a32f890ca6fdc82e3072e0ea0368.png)