Mercurial > hg
diff contrib/simplemerge @ 10784:716e76f89e3a stable
Merge with i18n
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 29 Mar 2010 15:16:05 -0500 |
parents | bb9f13974d8e |
children | 659f34b833b9 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 29 Mar 2010 15:16:05 -0500 |
parents | bb9f13974d8e |
children | 659f34b833b9 |