"Diff to Other" is always disabled
In the "Resolve Conflicts" dialog, the "Diff to Other" button seems to always be disabled.
I'm not sure when this broke, but it was working in 5.0.2.
Steps to Reproduce
$ hg init
$ echo a>test.txt
$ hg add .
adding test.txt
$ hg commit -m a -u u
$ echo b>test.txt
$ hg commit -m b -u u
$ hg up -r 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c>test.txt
$ hg commit -m c -u u
created new head
$ hg log -G -T {node}
@ 1417351bd6738b9d4f421cb18fee405f0c5e7c62
|
| o 9399e099f903b79e2d2685ecb61f43871f09d54c
|/
o 4d891309177e541f991965e6a1288cfef953f1bb
$ thg rebase -s 1417351bd6738b9d4f421cb18fee405f0c5e7c62 -d 9399e099f903b79e2d2685ecb61f43871f09d54c
- In the "Rebase" dialog, click "Rebase". The rebase generates conflicts, so click "resolved".
- In the "Resolve Conflicts" dialog, select "test.txt" in "Unresolved conflicts" and click "Take Local".
- Select "test.txt" in "Resolved conflicts". "Diff to Local" is enabled, but "3-Way Diff" and "Diff to Other" are disabled.
(Merge tool selection seems to make no difference -- I have tried with Beyond Compare 4 and WinMerge.)