Beyond Compare: Diff to Parent displays wrong value for a merge
Created originally on Bitbucket by Gili
Beyond Compare 3 TortoiseHg 3.1.1
"Diff to Parent" shows the wrong diff for merge commits.
Repro steps:
- Go to any merge commit, and "Diff to Parent" on one of the files.
- Beyond Compare will show what a 3-way merge would look like if you were merging right now, as opposed to showing what the merge actually looked like in the past.
- It's possible that in the past, Beyond Compare made recommendations on how to merge the lines but the user decided to merge the lines differently. This is actually quite common. In such a case, "Diff to Parent" fails to show what really changed.