--- a/mercurial/merge.py	Wed Feb 08 23:03:33 2017 -0800
+++ b/mercurial/merge.py	Thu Feb 09 09:55:31 2017 -0800
@@ -1554,7 +1554,7 @@
                 dirty = wc.dirty(missing=True)
                 if dirty:
                     # Branching is a bit strange to ensure we do the minimal
-                    # amount of call to obsolete.background.
+                    # amount of call to obsolete.foreground.
                     foreground = obsolete.foreground(repo, [p1.node()])
                     # note: the <node> variable contains a random identifier
                     if repo[node].node() in foreground: