Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert.out @ 1748:2428e6d66f06
bisect: fix for recent changes disallowing "false" merges
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 19 Feb 2006 18:59:20 +0100 |
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