Mercurial > hg
diff tests/test-rename-merge2.out @ 5148:06154aff2b1a
merge with -stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 08 Aug 2007 23:00:01 +0200 |
parents | f191bc3916f7 |
children | 4b6f0aa568e5 |
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 08 Aug 2007 23:00:01 +0200 |
parents | f191bc3916f7 |
children | 4b6f0aa568e5 |