Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3893:6b4127c7d52a
Simplify i18n imports
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 14 Dec 2006 20:25:19 -0600 |
parents | abaee83ce0a6 |
children | 656e06eebda7 |
line wrap: on
line diff