view tests/test-merge-revert.out @ 1198:66f7d3946109

Add test output.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 03 Sep 2005 23:52:39 -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