https://bz.mercurial-scm.org/show_bug.cgi?id=6054
Bug ID: 6054
Summary: Merge conflict not found if file only contains one
line
Product: Mercurial
Version: 4.8
Hardware: Other
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: carl.bar...@wirefast.com
CC: mercurial-devel@mercurial-scm.org
In order to have a play with mercurial, I created a repository with a single
file that contained a single line of text. I then played around changing the
contents of the file (but always only a single line) until I got two heads.
When I did a merge between the heads, mercurial simply replaced the current
version of the file with the version from the new branch. However, if the file
had two or more lines, the merge reported a conflict.
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
