Mercurial > hg
diff tests/test-simplemerge.py @ 15470:93273948cdce stable
merge with i18n
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 10 Nov 2011 11:00:02 -0600 |
parents | e433002acb05 |
children | 7de7630053cb |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 10 Nov 2011 11:00:02 -0600 |
parents | e433002acb05 |
children | 7de7630053cb |