1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/issue29.go.out	Tue Dec 11 09:31:35 2007 -0800
     1.3 @@ -0,0 +1,16 @@
     1.4 +$ \textbf{hg init issue29}
     1.5 +$ \textbf{cd issue29}
     1.6 +$ \textbf{echo a > a}
     1.7 +$ \textbf{hg ci -Ama}
     1.8 +adding a
     1.9 +$ \textbf{echo b > b}
    1.10 +$ \textbf{hg ci -Amb}
    1.11 +adding b
    1.12 +$ \textbf{hg up 0}
    1.13 +0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    1.14 +$ \textbf{mkdir b}
    1.15 +$ \textbf{echo b > b/b}
    1.16 +$ \textbf{hg ci -Amc}
    1.17 +adding b/b
    1.18 +$ \textbf{hg merge}
    1.19 +