changeset 295:43bfadf9b760
Fixed sample output for 'issue29' test.
author |
Guido Ostkamp <hg@ostkamp.fastmail.fm> |
date |
Wed Aug 20 21:50:17 2008 +0200 (2008-08-20) |
parents |
1ea91eb01030 |
children |
e0b56f008b09 |
files |
en/examples/issue29.go.out |
line diff
1.1 --- a/en/examples/issue29.go.out Wed Aug 20 21:49:39 2008 +0200
1.2 +++ b/en/examples/issue29.go.out Wed Aug 20 21:50:17 2008 +0200
1.3 @@ -12,5 +12,6 @@
1.4 $ \textbf{echo b > b/b}
1.5 $ \textbf{hg ci -Amc}
1.6 adding b/b
1.7 +created new head
1.8 $ \textbf{hg merge}
1.9