diff mercurial/simplemerge.py @ 13220:4a39a6afc892 stable

i18n-sv: synchronized with d4393968318f
author Jens Bäckman <jens.backman@gmail.com>
date Tue, 21 Dec 2010 09:26:59 +0100
parents 4cdaf1adafc8
children d13913355390 3c65cdcf3ba6
line wrap: on
line diff