diff --git a/mercurial/merge.py b/mercurial/merge.py