view tests/test-merge-revert.out @ 1389:9b3ef6f3cef5

convert-repo: fix up octopus merge conversion
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Oct 2005 19:27:35 -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