hgbook

diff en/examples/issue29.go.out @ 491:795f2964e104

translated section 13.4
author Javier Rojas <jerojasro@devnull.li>
date Wed Jan 07 22:26:07 2009 -0500 (2009-01-07)
parents 91a936be78b8
children
line diff
     1.1 --- a/en/examples/issue29.go.out	Mon Mar 12 23:11:26 2007 -0700
     1.2 +++ b/en/examples/issue29.go.out	Wed Jan 07 22:26:07 2009 -0500
     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