comparison hgext/imerge.py @ 5670:840e2b315c1f

Fix misleading error and prompts during update/merge (issue556)
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 26 Dec 2007 22:47:16 +0100
parents 3786ef8877d5
children 7855b88ba838
comparison
equal deleted inserted replaced
5669:a0eb8a418442 5670:840e2b315c1f