changeset 6226 | bd61e44eb2cc |
parent 6207 | 03b13d853dc6 |
child 6246 | 35bf9c23e17a |
--- a/tests/test-fetch.out Tue Mar 11 11:30:42 2008 -0700 +++ b/tests/test-fetch.out Tue Mar 11 11:38:12 2008 -0700 @@ -71,3 +71,5 @@ merging with 3:cc6a3744834d 1 files updated, 0 files merged, 0 files removed, 0 files unresolved new changeset 4:55aa4f32ec59 merges remote changes with local +% should abort, because i is modified +abort: working directory is missing some files