hgbook

diff en/examples/backout.manual.merge.out @ 359:854a70fc05c6

find changesets by author, revision, files, or words in the commit message
Translated copy section of daily.tex
author Igor TAmara <igor@tamarapatino.org>
date Sat Oct 25 17:27:51 2008 -0500 (2008-10-25)
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	Sat Oct 25 17:27:51 2008 -0500
     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