[Bug 5596] New: histedit should explain where it is on conflicts

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=5596

            Bug ID: 5596
           Summary: histedit should explain where it is on conflicts
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Mac OS
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: histedit
          Assignee: bugzilla at mercurial-scm.org
          Reporter: axel at mozilla.com
                CC: mercurial-devel at mercurial-scm.org

When histedit hits a merge conflict, I have no clue where it is, and what A and
B and C could possibly be.

It should report which patch it's having conflicts with, and what the resulting
patch is going to be, by commit message.

-- 
You are receiving this mail because:
You are on the CC list for the bug.