diff tests/test-simplemerge.py @ 5234:20770c5d41e0

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 26 Aug 2007 19:13:24 +0200
parents ff7253a0d1da
children
line wrap: on
line diff