merge with stable
authorThomas Arendsen Hein <thomas@intevation.de>
Thu, 26 Aug 2010 17:55:07 +0200
changeset 12047 dee1901a0ed8
parent 12045 1e8c7999af86 (current diff)
parent 12046 8e7960feb139 (diff)
child 12054 5d22e631c365
merge with stable
mercurial/filemerge.py