For some conflicts, the merge editor shows an Accept Combination button. Accepting the combination resolves the current conflict by smartly merging both changes. This is especially useful for changes in the same line that don't touch the same characters.
Would it be feasible to add something like this to this diffview plugin?
First off, thank you for this useful plugin.
VScode has a pretty neat feature that allows a same line conflict to be resolved very quickly and efficiently.
From here: https://code.visualstudio.com/docs/sourcecontrol/overview#_resolving-conflicts
Would it be feasible to add something like this to this diffview plugin?