diff -r 09c5f734ff6a -r 5e05007d3857 mercurial/merge.py