hgbook

view ja/examples/tour.merge.merge.out @ 850:5bbebcdfb533

You wouldn't believe me if I told you.
author gpiancastelli
date Sat Aug 22 18:49:12 2009 +0200 (2009-08-22)
parents
children
line source
1 $ \textbf{hg merge}
2 merging hello.c
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)