Mercurial > hg > easyhg

diff help/topics.html @ 531:f56e5c39aad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start work on merge topic
author Chris Cannam
date Wed, 23 Nov 2011 17:03:43 +0000
parents b3309be1640f
children 06507a59f2b8
line wrap: on
line diff
--- a/help/topics.html	Wed Nov 23 11:24:23 2011 +0000
+++ b/help/topics.html	Wed Nov 23 17:03:43 2011 +0000
@@ -20,3 +20,6 @@
 <p><a href="a-31.html">I want to let my colleagues pull changes directly from my local repository</a></p>
 <p><a href="a-32.html">I want to put my changes into a master repository shared with my colleagues</a></p>
 <p><a href="a-33.html">I tried to push my changes, but it told me &ldquo;the remote repository may have been changed by someone else&rdquo; and refused</a></p>
+<p><a href="a-34.html">How do I use this Merge window?</a></p>
+<h3>See also</h3>
+<p><a href="a-40.html">Video tutorials</a></p>