diff -r acb87c5b4aeb -r 65f14ca8d2eb mercurial/simplemerge.py