hgbook
diff en/examples/tour.merge.merge.out @ 263:9dbed77d3ba6
Fix typo
author | Tong-Kiat Tan <tktan@jokey.org> |
---|---|
date | Fri Jul 27 15:07:51 2007 -0700 (2007-07-27) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/tour.merge.merge.out Fri Jul 27 15:07:51 2007 -0700 1.3 @@ -0,0 +1,4 @@ 1.4 +$ \textbf{hg merge} 1.5 +merging hello.c 1.6 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 1.7 +(branch merge, don't forget to commit)