hgbook
diff ja/examples/backout.manual.merge.out @ 709:f9f71850ae1a
Merge with foozy
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri Aug 14 12:10:47 2009 -0700 (2009-08-14) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/examples/backout.manual.merge.out Fri Aug 14 12:10:47 2009 -0700 1.3 @@ -0,0 +1,8 @@ 1.4 +$ \textbf{hg merge} 1.5 +merging myfile 1.6 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 1.7 +(branch merge, don't forget to commit) 1.8 +$ \textbf{hg commit -m 'merged backout with previous tip'} 1.9 +$ \textbf{cat myfile} 1.10 +first change 1.11 +third change