view tests/test-merge-revert.out @ 997:458b84a96e1c

Fix handling of addresses in hgrc.
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 21 Aug 2005 23:03:14 -0800
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