diff mercurial/version.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 50da4bb9cab6
children 7eb694a1c1af
line wrap: on
line diff