Three-way diff button shows just a two-way diff
I did a merge between two branches.
All conflicts were resolved automatically, but I wanted to review and very probably change how some of them were resolved, because there were changes from one branch that I wanted to discard.
So I did:
- Right-click on the other revision -> Merge to local
- clicked next
- clicked "Review"
- selected one of the files in the list below, and clicked "3-way diff"
And it opened up this window, which is not a 3-way diff, but rather a simple diff, between god-knows which 2 versions of the file (it would seem it's on the left side the merged file, and on the right side the "other" revision, hence the local version would be missing).
I don't know whether or not this has to do with the fact that I'm trying to edit a merge where all the conflicts were automatically resolved, but either way this is stupid.