Resolve by "taking theirs" or "taking mine"

[mstum]

When I have a merge conflict, it would be nice if the Resolve screen has an option to just “take theirs” or “take mine”.

[srbs]

Feel free to create an enhancement in the official tracker: https://github.com/sublimehq/sublime_merge/issues

[mstum]

Thanks, opened Issue #316 for that.