diff -r 07fc2f2134ba -r cc91f3bc5461 mercurial/merge.py
--- a/mercurial/merge.py	Sat Jan 02 03:02:57 2016 -0800
+++ b/mercurial/merge.py	Sat Jan 02 03:02:57 2016 -0800
@@ -570,19 +570,19 @@
     files. For some actions, the result is to abort; for others, it is to
     choose a different action.
     """
-    aborts = []
+    conflicts = []
     if not force:
         for f, (m, args, msg) in actions.iteritems():
             if m in ('c', 'dc'):
                 if _checkunknownfile(repo, wctx, mctx, f):
-                    aborts.append(f)
+                    conflicts.append(f)
             elif m == 'dg':
                 if _checkunknownfile(repo, wctx, mctx, f, args[0]):
-                    aborts.append(f)
+                    conflicts.append(f)
 
-    for f in sorted(aborts):
+    for f in sorted(conflicts):
         repo.ui.warn(_("%s: untracked file differs\n") % f)
-    if aborts:
+    if conflicts:
         raise error.Abort(_("untracked files in working directory differ "
                            "from files in requested revision"))