# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1451732577 28800
# Node ID 198d291e9ffad20abae5e59be7e2f799487a3450
# Parent  cc91f3bc5461d4f486ca418f9dd4d23c19090885
checkunknownfiles: make control flow clearer

In particular, make it clear that we only check for and abort on conflicts if
force is not true.

diff -r cc91f3bc5461 -r 198d291e9ffa 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
@@ -580,11 +580,11 @@
                 if _checkunknownfile(repo, wctx, mctx, f, args[0]):
                     conflicts.append(f)
 
-    for f in sorted(conflicts):
-        repo.ui.warn(_("%s: untracked file differs\n") % f)
-    if conflicts:
-        raise error.Abort(_("untracked files in working directory differ "
-                           "from files in requested revision"))
+        for f in sorted(conflicts):
+            repo.ui.warn(_("%s: untracked file differs\n") % f)
+        if conflicts:
+            raise error.Abort(_("untracked files in working directory differ "
+                                "from files in requested revision"))
 
     for f, (m, args, msg) in actions.iteritems():
         if m == 'c':