diff tests/test-simplemerge.py.out @ 7449:f848d7f96195

help: try topics before commands to avoid "diffs" showing help for diffstat
author Georg Brandl <georg@python.org>
date Mon, 01 Dec 2008 13:44:34 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line diff