Enable tripartite edit mode using sublimerge

Question

I am trying to integrate elevated and git together, and sublimerge seems to be a great tool, except that I cannot find a way to allow manual changes when doing 3-way diff (e.g. resolving a merge conflict).

Does anyone know a way to do this (in any version of sublime / sublimerge)?

ps Sublime Text 3 and sublimerge v2.10.5

Answer 1

No. According to the developers (I sent them by email) due to limitations in the Sublimes API, the editing mode is not available in the tripartite diff view.

Answer 2

According to this - http://www.sublimerge.com/docs/configuration.html you can merge files using [left] / [right] to select which version of the line you want to use, or [shift] + [ left] / [shift] + [right] for the whole file.