view tests/test-merge4.out @ 1105:a906b018eaef

Replaced hg status -p/--strip with -n/--no-status to not confuse with patch.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 27 Aug 2005 23:23:32 +0200
parents 5a034646e472
children b2ae81a7df29
line wrap: on
line source