hgbook
diff en/examples/results/tour.merge.merge.out @ 563:44d1363234d2
Move example output files into examples/results
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 09 21:37:47 2009 -0700 (2009-03-09) |
parents | en/examples/tour.merge.merge.out@006bbad1f190 |
children | 0d5935744f87 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/results/tour.merge.merge.out Mon Mar 09 21:37:47 2009 -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)