diff hgmerge @ 3080:e270cbd4aa20

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 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff