[Bug 4841] New: no way to escape from a series of interactive conflict resolutions

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4841

            Bug ID: 4841
           Summary: no way to escape from a series of interactive conflict
                    resolutions
           Product: Mercurial
           Version: earlier
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: rm at fb.com
                CC: mercurial-devel at selenic.com

If the user has an interactive merge tool configured, it will spawn for every
file with conflicts. If there are a lot of conflicts, the user can get stuck in
nearly endless invocations of the merge tool, and there is no way to escape
this fate.

Lots of conflicts are common when the rebases or merge is doomed anyway (ie,
wrong destination), so this is especially frustrating in this case.

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