hgbook
diff ja/examples/tour.merge.merge.out @ 862:ad6d3f5245e7
Link back to the original English version of the book.
author | gpiancastelli |
---|---|
date | Fri Aug 28 12:21:45 2009 +0200 (2009-08-28) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/examples/tour.merge.merge.out Fri Aug 28 12:21:45 2009 +0200 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)