# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1486662931 28800
# Node ID dd995a5db8fdc164d040d0596cc9b7b0be674854
# Parent  e6932e9a262a2b122185cb439340a980f0be6c6f
update: fix typo/stale comment to match code

The comment about "obsolete.background" seems to have been about
obsolete.foreground ever since it was introduced in a59e575c6ff8
(update: allow dirty update to foreground (successors), 2013-04-16),
so let's change it.

diff -r e6932e9a262a -r dd995a5db8fd mercurial/merge.py
--- 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: