Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-simplemerge.py @ 5481:04f033a03b1d
merge with -stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 26 Oct 2007 12:37:59 +0200 |
| parents | ff7253a0d1da |
| children |
comparison
equal
deleted
inserted
replaced
| 5479:dd5ca84ed868 | 5481:04f033a03b1d |
|---|