comparison en/examples/tour @ 828:477d6a3e5023

Many final changes.

827:d2aacc06e562

#$ name:
cp hello.c ../new-hello.c
sed -i '/printf("hello,/i\\tprintf("once more, hello.\\n");' ../new-hello.c

#$ name: merge.clone

cd ..
hg clone hello my-new-hello
cd my-new-hello
# 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

hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello

828:477d6a3e5023

#$ name:
cp hello.c ../new-hello.c
sed -i '/printf("hello,/i\\tprintf("once more, hello.\\n");' ../new-hello.c

my-text-editor()
{
cp ../new-hello.c hello.c
}

#$ name: merge.clone

cd ..
hg clone hello my-new-hello
cd my-new-hello
# Make some simple edits to hello.c.
my-text-editor hello.c
hg commit -m 'A new hello for a new day.'

#$ name: merge.dummy2

hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello