Thanks a lot, will await it in release!
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.
Customer support service by UserEcho