Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-merge1.out @ 5215:b0bc8cf41ffc
merge with -stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 24 Aug 2007 00:39:16 +0200 |
parents | f191bc3916f7 |
children | 17ed9b9a0d03 |