Answer the question
In order to leave comments, you need to log in
Why does vimdiff open with three windows when merging branches?
Merging branches opens vimdiff with three windows. The purpose of each?
At random, it was found that the first window is the branch into which the changes are poured.
The second window - which branch we merge with the current one. Why do you need a third - in the fog.
The task of setting up vimdiff seems to be handled by mercurial, but the docs don't say anything about it.
Answer the question
In order to leave comments, you need to log in
This should be the standard view for a 3-way merge -- a common ancestor, changes in one branch, and changes in a second branch.
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question