1. David Soria Parra
  2. hg-website-content


Arne Babenhauserheide  committed a856a9e

guide: added a note with a link to the conflict tutorial.

  • Participants
  • Parent commits 25e3001
  • Branches default

Comments (0)

Files changed (1)

File guide/index.html

View file
  • Ignore whitespace
+<div class="note">
+<p class="note-title">Note:</p>
+For more details on resolving conflicts, see the wiki-page <a title="Tutorial - Merging conflicting Changes href="http://mercurial.selenic.com/wiki/TutorialConflict">TutorialConflict</a>.
 <p>Mark the fixed file as resolved</p>
 <pre>$ hg resolve --mark conflicting_file