3

I read "the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names" from here. Exactly what are those identifiers, and does :diffget //2 work for 2-way diff at all?

1 Answer 1

2

Whichever tool creating the buffer (fugitive etc), they do create buffername including "//2" for target buffer, and "//3" for merge buffer. Then we can use "//2" and "//3" as bufspec during merge.

As for 2-way diff (during amending or rebasing etc), there's one buffer with "//0" in its name. But in this case, the "//0" buffer could either be the buffer we want to copy the change to or from, depending on the scenario.

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Not the answer you're looking for? Browse other questions tagged or ask your own question.