diff -r ab681ea2857e -r 5a034646e472 tests/test-merge3.out --- a/tests/test-merge3.out Tue Aug 16 17:30:41 2005 -0800 +++ b/tests/test-merge3.out Tue Aug 16 19:03:01 2005 -0800 @@ -1,8 +1,3 @@ -+ hg init -+ hg add a -+ hg commit -m commit #0 -d 0 0 -+ hg add b -+ hg commit -A -mcomment #1 -d 0 0 removing b b never committed! nothing changed