[Python-checkins] devguide (hg_transition): Mention that "hg merge" usually figures out what to merge

[antoine.pitrou]

http://hg.python.org/devguide/rev/2283a2907348
changeset:   363:2283a2907348
branch:      hg_transition
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Mar 02 16:20:22 2011 +0100
summary:
  Mention that "hg merge" usually figures out what to merge

files:
  faq.rst

diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -423,11 +423,15 @@
 How do I find out which revisions need merging?
 -----------------------------------------------
 
-Running::
+In unambiguous cases, Mercurial will find out for you if you simply try::
+
+   hg merge
+
+If that fails and Mercurial asks for explicit revisions, running::
 
    hg heads
 
-Gives you the list of branch heads in your local repository.  If you are
+will give you the list of branch heads in your local repository.  If you are
 working only in a particular named branch, for example ``default``, do::
 
    hg heads default

-- 
Repository URL: http://hg.python.org/devguide