view tests/test-merge-revert.out @ 1252:94f38724283f

The copy tests don't need to invoke cp any longer.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 14 Sep 2005 16:31:03 -0700
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