hgbook
view en/examples/backout.non-tip.backout.out @ 356:0db175abfaf3
some friggin' merge or something like that.
| author | jerojasro@localhost |
|---|---|
| date | Tue Oct 21 22:41:51 2008 -0500 (2008-10-21) |
| parents | 006bbad1f190 |
| children |
line source
1 $ \textbf{echo third change >> myfile}
2 $ \textbf{hg commit -m 'third change'}
3 $ \textbf{hg backout --merge -m 'back out second change' 1}
4 reverting myfile
5 created new head
6 changeset backs out changeset
7 merging with changeset
8 merging myfile
9 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
10 (branch merge, don't forget to commit)