view en/examples/issue29.go.out @ 395:e0b56f008b09

Fix sample output for 'backout' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 21:51:54 +0200
parents 43bfadf9b760
children
line wrap: on
line source

$ \textbf{hg init issue29}
$ \textbf{cd issue29}
$ \textbf{echo a > a}
$ \textbf{hg ci -Ama}
adding a
$ \textbf{echo b > b}
$ \textbf{hg ci -Amb}
adding b
$ \textbf{hg up 0}
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ \textbf{mkdir b}
$ \textbf{echo b > b/b}
$ \textbf{hg ci -Amc}
adding b/b
created new head
$ \textbf{hg merge}