Commits

php committed 4ba63b5

Update 20111113

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
 
 <h1 id="complex_workflows">More Complex Workflows</h1>
 
-<p>If you now want to check some more complex workflows, please have a look at the general <a title="Mercurial Workflows" href="http://selenic.com/mercurial/wiki/Workflows">workflows wikipage</a>.</p>
+<p>If you now want to check some more complex workflows, please have a look at the general <a title="Mercurial Workflows" href="http://selenic.com/mercurial/wiki/Workflows">workflows wikipage</a> and the list of <a title="Mercurial extensions" href="http://mercurial.selenic.com/wiki/UsingExtensions">extensions</a>.</p>
 
 <p>To deepen your understanding, you should also check the <a title="Overview of the basic concepts of Mercurial" href="http://mercurial.selenic.com/wiki/UnderstandingMercurial">basic concept overview</a>.</p>
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.