hgbook
diff en/examples/backout.manual.merge.out @ 167:e67251ac336f
Small portability change. "grep -P" doesn't work on Debian.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue Mar 27 01:15:34 2007 -0500 (2007-03-27) |
parents | |
children | 5fc4a45c069f |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/backout.manual.merge.out Tue Mar 27 01:15:34 2007 -0500 1.3 @@ -0,0 +1,7 @@ 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 +third change