--- wikisrc/users/dholland/hgnb.mdwn	2014/12/14 09:51:06	1.11
+++ wikisrc/users/dholland/hgnb.mdwn	2014/12/14 09:52:59	1.12
@@ -65,6 +65,7 @@ committed, you need to do an explicit me
 push.
 
 In the simple case, you do an explicit merge as follows:
+
                                         hg pull
                                         hg merge
                                         hg commit
@@ -72,9 +73,11 @@ In the simple case, you do an explicit m
 When you get a merge conflict, you first need to resolve it (in the
 usual way by editing) and then you must tag it resolved in hg before
 hg will let you commit, like this:
+
                                         hg resolve -m file
 
 You can list unresolved conflicts thus:
+
                                         hg resolve -l
 
 Note that even with the explicit merge this is almost exactly
@@ -86,6 +89,7 @@ that touches the same files you've edite
 There is one gotcha, which is that you can't do explicit merges in a
 tree with uncommitted changes. The best way around this is to stash
 your changes:
+
                                         hg stash
                                         hg merge
                                         ...whatever merge stuff...
@@ -122,6 +126,7 @@ push, pull, incoming, and outgoing.
 A commit with no descendents (that is, the most recent commit on any
 line of development) is called a "head".
 You can list these as follows:
+
                                         hg heads
 
 This will include commits that have descendents only on other
@@ -134,10 +139,12 @@ incoming" and "hg outgoing" respectively
 
 If you interrupt Mercurial (or Mercurial gets interrupted, e.g. by a
 system crash) you want to do this afterwards:
+
                                         hg recover
 
 and if you have reason to think the repository might be corrupt you
 can check it like this:
+
                                         hg verify
 
 ### Development branches
@@ -173,11 +180,13 @@ warning is aimed at git users who ought 
 instead and not something you need to be concerned about.
 
 Check out a new tree on a branch:
+
     cvs co -P -rlibc13                  hg clone [url]
                                         cd src
                                         hg update -r libc13
 
 Switch to a new tree on a branch:
+
     cvs up -dP -A -rlibc13              hg pull                         (if needed)
                                         hg update -r libc13
 
@@ -185,6 +194,7 @@ Note that if you have uncommitted change
 crossing from one branch to another because it doesn't know how to
 merge them.
 In that case do this:
+
                                         hg update -r libc13-base
                                         [resolve conflicts if needed]
                                         hg update -r libc13
@@ -403,8 +413,10 @@ local modification until whatever issue 
 sorted out.
 
 To revert to a specific version:
+
                                         hg revert -r rev subtree
 To revert to a specific date:
+
                                         hg revert -d date subtree