# HG changeset patch # User Thomas Arendsen Hein # Date 1282838107 -7200 # Node ID dee1901a0ed8427752962d96eb6f3040b1c35f9e # Parent 1e8c7999af868765d320277241a5ce64a7042b3b# Parent 8e7960feb139000a407e67d43749e3cb9ad7cae8 merge with stable diff -r 1e8c7999af86 -r dee1901a0ed8 mercurial/filemerge.py