hgbook

diff en/examples/tour.merge.merge.out @ 222:b2b593eb56e7

find changesets by author, revision, files, or words in the commit message
Add sillybench script.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue May 15 14:52:41 2007 -0700 (2007-05-15)
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	Tue May 15 14:52:41 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)