Mercurial > hg
diff contrib/simplemerge @ 20153:35bfe5405fb4 stable
merge with i18n
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 01 Dec 2013 13:45:00 -0600 |
parents | 9de689d20230 |
children | f18830651811 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 01 Dec 2013 13:45:00 -0600 |
parents | 9de689d20230 |
children | f18830651811 |