diff mercurial/merge.py @ 7204:ad28279053ef

Remove trailing space
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 22 Oct 2008 18:55:07 +0200
parents 865c5be0f8df
children 89207edf3973
line wrap: on
line diff