[MERGE] Status honours FILE parameters for conflicts (#127606)

[John Arbash Meinel]

John Arbash Meinel has voted +1 (conditional).
Status is now: Conditionally approved
Comment:
Shouldn't this:
+            conflicts = new.conflicts()
+            if specific_files is not None:
+                conflicts = conflicts.select_conflicts(new, 
specific_files,
+                    ignore_misses=True, recurse=True)[1]

be:

+            if specific_files is not None:
+                conflicts = conflicts.select_conflicts(new, 
specific_files,
+                    ignore_misses=True, recurse=True)[1]
+            else:
+                conflicts = new.conflicts()


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C46A4C0B3.8040005%40utoronto.ca%3E