changeset 6736 | 369ddc9c0339 |
parent 6646 | 9eb274d773d9 |
--- a/tests/test-merge-remove.out Wed Jun 25 12:53:57 2008 -0700 +++ b/tests/test-merge-remove.out Wed Jun 25 17:33:34 2008 -0500 @@ -23,7 +23,6 @@ M foo1 foo % reverting foo1 and bar -warning: working directory has two parents, tag '.' uses the first saving current version of bar as bar.orig reverting bar saving current version of foo1 as foo1.orig