hgbook
view en/examples/results/backout.manual.merge.out @ 593:8dfdbe1cf982
Update Apache2 configuration.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu Mar 26 22:00:32 2009 -0700 (2009-03-26) |
| parents | 44d1363234d2 |
| children | 4432ad34b8e5 |
line source
1 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
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 <prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
6 <prompt>$</prompt> <userinput>cat myfile</userinput>
7 first change
8 third change
9 </screen>