tests/test-merge4
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 07 Apr 2007 04:27:55 -0300
changeset 4315 bc6f5a1d8b7b
parent 2283 e506c14382fd
permissions -rwxr-xr-x
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output This should make it easier to discover global options. As a bonus, they are no longer displayed by something like a hg -v help dates

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"