view tests/test-merge-revert.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 7544700fd931
line wrap: on
line source

1:3aa14bbc23d9
0:8633637036c1
3aa14bbc23d9 tip
8633637036c1
8633637036c1+
8633637036c1
3aa14bbc23d9 tip
merging file1
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip