resolve: move reset to localrepo.commit
This way rebase doesn't leave a stale resolve state
i18n: update Japanese translation to follow
bd8f44638847
Optimization of pure.base85.b85encode
This makes pure python base85 encoding 3x faster than before. Now it is only
40x slower than the C version.