[Bug 4973] New: No help topic about conflict and conflict marker

[mercurial-bugs at selenic.com]

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

            Bug ID: 4973
           Summary: No help topic about conflict and conflict marker
           Product: Mercurial
           Version: default branch
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: pierre-yves.david at ens-lyon.org
                CC: mercurial-devel at selenic.com

I cannot find a help topic that explain conflict and basic conflict markers. We
should probably offer some explanation about that to our user.

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