comparison tests/test-merge4.out @ 925:5a034646e472

run-tests: remove '+ hg' trick This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.
author mpm@selenic.com
date Tue, 16 Aug 2005 19:03:01 -0800
parents 0902ffece4b4
children b2ae81a7df29
comparison
equal deleted inserted replaced
924:ab681ea2857e 925:5a034646e472
1 + hg init
2 + hg add a
3 + hg commit -m commit #0 -d 0 0
4 + hg add b
5 + hg commit -m commit #1 -d 0 0
6 + hg update 0
7 + hg add c
8 + hg commit -m commit #2 -d 0 0
9 + hg update -m 1
10 + hg commit -m commit #3 -d 0 0