Mercurial > hg
comparison tests/test-merge6.t @ 12873:e1855dee28c1 stable
merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 27 Oct 2010 16:54:46 -0500 |
| parents | 4c94b6d0fb1c |
| children | ffb5c09ba822 |
comparison
equal
deleted
inserted
replaced
| 12867:eda77c3e246a | 12873:e1855dee28c1 |
|---|