view tests/test-merge2.out @ 849:8933ef744325

Further help improvements: Show command aliases in 'hg help something', unless in quiet mode. Show short command description with 'hg help -q something'. Show global options in verbose mode of command help. State that Mercurial is a Distributed SCM.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 06 Aug 2005 15:43:12 +0100
parents 0902ffece4b4
children 5a034646e472
line wrap: on
line source

+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg add b
+ hg commit -m commit #2 -d 0 0
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg commit -A -m commit #2 -d 0 0
adding b
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg remove b
+ hg update 0
+ hg commit -A -m commit #2 -d 0 0
adding b