hgbook

diff en/examples/backout.manual.merge.out @ 948:afdc168fa06c

find changesets by author, revision, files, or words in the commit message
Merge from Hugues and my work
author Romain PELISSE <belaran@gmail.com>
date Mon Feb 16 23:31:14 2009 +0100 (2009-02-16)
parents 006bbad1f190
children
line diff
     1.1 --- a/en/examples/backout.manual.merge.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/backout.manual.merge.out	Mon Feb 16 23:31:14 2009 +0100
     1.3 @@ -4,4 +4,5 @@
     1.4  (branch merge, don't forget to commit)
     1.5  $ \textbf{hg commit -m 'merged backout with previous tip'}
     1.6  $ \textbf{cat myfile}
     1.7 +first change
     1.8  third change