Commits

Anonymous committed a856a9e

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

Comments (0)

Files changed (1)

 
 </pre>
 
+<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>.
+</div>
+
+
 <p>Mark the fixed file as resolved</p>
 
 <pre>$ hg resolve --mark conflicting_file