changeset 5516 | f252ba975925 |
parent 5487 | 7a64931e2d76 |
child 5762 | c2a21fe60994 |
--- a/tests/test-issue660.out Fri Oct 26 16:43:13 2007 -0700 +++ b/tests/test-issue660.out Wed Nov 07 22:57:28 2007 +0100 @@ -40,3 +40,10 @@ abort: directory 'd' already in dirstate % removing shadow % should succeed - shadow removed +% update should work at least with clean workdir +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +C a +C b/b +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +C a/a +C b