diff mercurial/merge.py @ 12546:5a19b576df52

l10n: sig, glog, cia, hgk, highlight, inotify, interhg New status: 1851 messages complete with 302 fuzzies and 745 untranslated. Transmitted-via: Transifex (www.transifex.net).
author Christoph <christoph@webvariants.de>
date Tue, 21 Sep 2010 23:05:28 +0000
parents 28e2e3804f2e
children 6f0d9d79111f
line wrap: on
line diff