view tests/test-merge-revert.out @ 1292:141951276ba1

Use platform-appropriate rc file names.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 21 Sep 2005 09:56:30 -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