how to get vimdiff apply both REMOTE and LOCAL changes?

792 Views Asked by At

when resolving a git conflict using vimdiff is it possible to apply changes from both buffers ? i tried

:diffget RE LO

and hoped that it would apply the changes in that order, so

<some content>
<REMOTE>
<LOCAL>
<rest of the file>

but it failed:

E94: No matching buffer for RE LO
0

There are 0 best solutions below