"Mercurial Merge" view no longer populates during a conflicted rebase

Created originally on Bitbucket by monotoli (Andy Lee)

Eclipse version: 4.6.2.M20161124-1400 Mercurial Version: 4.1.3

Steps to reproduce: -Perform a rebase that will result in a conflict (e.g. "hg rebase -r . -d tip") -Rebase pauses due to conflict -Eclipse properly reports the project as being in a conflicted rebasing state (displays red arrows along with "REBASING!" text) -Open the 'Mercurial Merge' view

Result: No files are listed in the merge view despite multiple files being flagged as conflicted by the rebase operation.

See attached error report from Eclipse; it contains an NPE stack trace that is likely the cause of this problem.

Attachments: mergeViewError.txt

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information