Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-simplemerge.py.out @ 4923:e8c0b52c363c
Better fix for issue 622 than we had in c4dd58af0fc8.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 18 Jul 2007 13:56:08 -0700 |
parents | 2e3c54fb79a3 |
children |