Mercurial > hgbook
diff en/examples/tour @ 718:4e23c220d1b0
Update chapter 2
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 06 Apr 2009 22:05:44 -0700 |
parents | c44d5854620b |
children | c8d662d3cb40 |
line wrap: on
line diff
--- a/en/examples/tour Tue Mar 31 22:56:37 2009 -0700 +++ b/en/examples/tour Mon Apr 06 22:05:44 2009 -0700 @@ -146,12 +146,17 @@ hg push http://hg.serpentine.com/tutorial/hello +#$ name: +cp hello.c ../new-hello.c +sed -i '/printf/i\\tprintf("once more, hello.\\n");' ../new-hello.c + #$ name: merge.clone cd .. hg clone hello my-new-hello cd my-new-hello -sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c +# The file new-hello.c is lightly edited. +cp ../new-hello.c hello.c hg commit -m 'A new hello for a new day.' #$ name: merge.dummy2