diff mercurial/simplemerge.py @ 12549:7b51cce70a37

merge stable into default
author Martin Roppelt <m.p.roppelt@web.de>
date Wed, 22 Sep 2010 09:22:42 +0200
parents 81c4e18c7cee
children 4f8067c94729
line wrap: on
line diff