hgbook

view en/examples/backout.manual.merge.out @ 931:9968b0ed4a38

find changesets by author, revision, files, or words in the commit message
First load of translation in the tour-basic
author Romain PELISSE <romain.pelisse@atosorigin.com>
date Sun Feb 08 23:39:21 2009 +0100 (2009-02-08)
parents 006bbad1f190
children
line source
1 $ \textbf{hg merge}
2 merging myfile
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)
5 $ \textbf{hg commit -m 'merged backout with previous tip'}
6 $ \textbf{cat myfile}
7 first change
8 third change