view tests/test-merge5 @ 4315:bc6f5a1d8b7b

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

mkdir t
cd t
hg init
echo This is file a1 > a
echo This is file b1 > b
hg add a b
hg commit -m "commit #0" -d "1000000 0"
echo This is file b22 > b
hg commit -m"comment #1" -d "1000000 0"
hg update 0
rm b
hg commit -A -m"comment #2" -d "1000000 0"
# in theory, we shouldn't need the "-y" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
hg update -y 1

exit 0