tests/test-merge1.t
branchstable
changeset 19498 3ac1735a2265
parent 19482 499fc471296b
child 19802 94c394653b2a
equal deleted inserted replaced
19497:e012a20061ed 19498:3ac1735a2265
    26 
    26 
    27 Test interrupted updates by exploiting our non-handling of directory collisions
    27 Test interrupted updates by exploiting our non-handling of directory collisions
    28 
    28 
    29   $ mkdir b
    29   $ mkdir b
    30   $ hg up
    30   $ hg up
    31   abort: Is a directory: '$TESTTMP/t/b'
    31   abort: *: '$TESTTMP/t/b' (glob)
    32   [255]
    32   [255]
    33   $ hg ci
    33   $ hg ci
    34   abort: last update was interrupted
    34   abort: last update was interrupted
    35   (use 'hg update' to get a consistent checkout)
    35   (use 'hg update' to get a consistent checkout)
    36   [255]
    36   [255]