diff tests/test-simplemerge.py @ 5058:a3d6de2838de

merge with hg-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 02 Aug 2007 13:03:25 +0200
parents ff7253a0d1da
children
line wrap: on
line diff