Mercurial > hg > gitweb

view tests/test-merge5.out @ 3080:e270cbd4aa20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 11 Sep 2006 10:23:23 +0200
parents 49988d9f0758
children 41989e55fa37
line wrap: on
line source

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