[Bug 5091] New: hg merge produces wrong result

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Tue Feb 9 16:55:26 EST 2016


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

            Bug ID: 5091
           Summary: hg merge produces wrong result
           Product: Mercurial
           Version: default branch
          Hardware: All
                OS: All
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: arcppzju+hgbug at gmail.com
                CC: mercurial-devel at selenic.com

cat << EOF > base
S
S
S
S
S
EOF

cat << EOF > local
S
S
S
X
S
S
S
EOF

cat << EOF > other
S
S
X
S
S
EOF

#### GIT
S
S
<<<<<<< HEAD
S
X
S
=======
X
>>>>>>> other
S
S


#### HG
S
S
X
S
X
S
<<<<<<< local
S
S
=======
>>>>>>> other

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


More information about the Mercurial-devel mailing list