tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Sep 2006 10:23:23 +0200
changeset 3077 e270cbd4aa20
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Fixed OSError "No such file or directory: None" and make IOError consistent. The None error occurs when the current working directory is no longer available, e.g. because it was removed in another shell.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes