Mercurial > hg
diff contrib/mergetools.hgrc @ 23050:7f8d16af8cae stable 3.2-rc
merge with i18n
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 18 Oct 2014 18:05:10 -0500 |
parents | 864bc2f4279b |
children |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 18 Oct 2014 18:05:10 -0500 |
parents | 864bc2f4279b |
children |