diff mercurial/merge.py @ 19410:26e5d866b1a0 stable

i18n-de: synchronized with fbdac607bff3
author Martin Schröder <martin.schroeder@nerdluecht.de>
date Sun, 14 Jul 2013 21:07:44 +0200
parents c60a7f5a741f
children 113681bbef9e
line wrap: on
line diff