smerge-makeup-conflict

smerge-makeup-conflict is an interactive compiled Lisp function in `smerge-mode.el'.


(smerge-makeup-conflict PT1 PT2 PT3 &optional PT4)

Insert diff3 markers to make a new conflict.
Uses point and mark for two of the relevant positions and previous marks
for the other ones.
By default, makes up a 2-way conflict,
with a C-u prefix, makes up a 3-way conflict.