hgbook

diff en/examples/backout.manual.merge.out @ 443:2daeda01fe98

find changesets by author, revision, files, or words in the commit message
Started mq, please do look the translation terms about push and pop on this context
author Igor TAmara <igor@tamarapatino.org>
date Sun Dec 07 17:47:38 2008 -0500 (2008-12-07)
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	Sun Dec 07 17:47:38 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