diff tests/test-merge6.out @ 1107:a9c45e537f77

Adjusted test-help for change to hg status.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 27 Aug 2005 23:35:30 +0200
parents 9344f5dd4488
children ced2d3620f95
line wrap: on
line diff