'show changes from second parent' doesn't work on an uncommited merge
Created originally on Bitbucket by Anonymous
When starting a merge of two revisions, and pressing the button 'commit later' in the merge dialog, the working directory has 2 parents. In this state, the GUI have 2 buttons designed to show the 'diff' from parent 1 & parent 2 When choosing the working directory and pressing the button to show the diff from parent 2, it shows instead the diff from parent 1.
After the merge is committed, the buttons behave as expected.
I attached images to present the issue on '1.png', the '1' button is pressed and the correct diff is shown below on '2.png', the '2' button is pressed and the same diff (as '1') is shown below on 'after merge 2.png', the '2' button is pressed and the correct diff is shown below
It is easy to replicate this using a new repository. On one file, create a change & commit, roll-back before the change, create a different change & commit, try to merge the 2 commits but press 'commit later' on the last merge dialog.