diff mercurial/lock.py @ 830:ca080d28d0af

If rejects are empty after using the editor, merge with diff+patch was ok.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Aug 2005 17:23:31 +0100
parents 574869103985
children 6d5a62a549fa
line wrap: on
line diff