Conflict Solver: add 'take both' merge option

Łukasz Arciszewski 8 years ago updated by Lev Shisterov 7 years ago 3

Now we have a 'take left' and 'take right' merge option. Sometimes its needed to 'take both' option with selection what should be first (like in kDiff)

Probably should include "conflict" keyword to be searchable.

Will just copy paste my text here:

When solving conflicts allow to select from: right, left, right before left, left before right.This is the only thing I really miss in SmartGit after TortoiseGit.

Thanks a lot, will await it in release!