diff i18n/posplit @ 13022:3fd4e4e81382

revert: improve merge advice and favor its error over all
author timeless <timeless@gmail.com>
date Sat, 20 Nov 2010 20:41:48 +0200
parents 4fd49329a1b5
children ff6ab0b2ebf7
line wrap: on
line diff