diff -r cce7ab960312 -r d51c4d85ec23 mercurial/merge.py
--- a/mercurial/merge.py	Thu Oct 17 16:13:15 2013 +0800
+++ b/mercurial/merge.py	Thu Oct 24 01:49:56 2013 +0800
@@ -725,7 +725,7 @@
                 repo.hook('update', parent1=xp2, parent2='', error=0)
                 return 0, 0, 0, 0
 
-            if pa not in (p1, p2):  # nolinear
+            if pa not in (p1, p2):  # nonlinear
                 dirty = wc.dirty(missing=True)
                 if dirty or onode is None:
                     # Branching is a bit strange to ensure we do the minimal