[Bug 6223] New: graft does not respect HGMERGE

[mercurial-bugs at mercurial-scm.org]

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

            Bug ID: 6223
           Summary: graft does not respect HGMERGE
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: evolution
          Assignee: bugzilla at mercurial-scm.org
          Reporter: arne_bab at web.de
                CC: mercurial-devel at mercurial-scm.org,
                    pierre-yves.david at ens-lyon.org
    Python Version: 2.7

When you set the mergetool in HGMERGE while having evolve activated, graft
still uses the default merge tool.

This hit me with
https://github.com/DisyInformationssysteme/hg-ci-evolution/blob/master/test-interaction.sh
(see TODO: bug: graft does not respect HGMERGE)

Without adding -t to graft, Mercurial ran meld instead of using
internal:merge-other.

Running this on another computer (right now), I cannot reproduce it, though.

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