Community
Participate
Working Groups
Follow-up on bug 548813: Open a conflict in the merge tool with "Last HEAD (unmerged)" as input. Make an edit and save, close the merge tool. Re-open the merge tool on that file. Actual: The label on the left (current) version states the item was from the 'ours' commit, but the text shown is from the working tree file. Expected: The label on that stage 2 version in the TextMergeViewer should not be the 'ours' commit but indicate that it's the working tree version. The labels cannot be assigned statically up front; they depend on the actual ITypeElements chosen by the tree walk.
New Gerrit change created: https://git.eclipse.org/r/c/egit/egit/+/182006
Gerrit change https://git.eclipse.org/r/c/egit/egit/+/182006 was merged to [master]. Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=063f146ba77307b2a22da795c75f91e7d7dccdc0