diff hgmerge @ 3686:4308f4cdc07b

Don't step into an endless loop when lock file is empty.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 20 Nov 2006 19:36:28 +0100
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff