Mercurial > hg
comparison tests/test-simplemerge.py @ 6886:41aaaa23745f
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 13 Aug 2008 20:18:40 -0500 |
parents | e75aab656f46 |
children | 08a0f04b56bd |
comparison
equal
deleted
inserted
replaced
6885:6e253aa04ff7 | 6886:41aaaa23745f |
---|