Mercurial > hg
diff mercurial/simplemerge.py @ 21970:27205c8335b0 stable
merge with i18n some more
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 01 Aug 2014 11:45:26 -0500 |
parents | 4aeb7a6029ba |
children | f18830651811 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 01 Aug 2014 11:45:26 -0500 |
parents | 4aeb7a6029ba |
children | f18830651811 |