Refactoring: pass more than one file to resolved()

[stgit] / stgit / commands / resolved.py

diff --git a/stgit/commands/resolved.py b/stgit/commands/resolved.py
index 845eca0..792dee5 100644 (file)
--- a/stgit/commands/resolved.py
+++ b/stgit/commands/resolved.py
@@ -77,7 +77,7 @@ def func(parser, options, args):
                 raise CmdException, 'No conflicts for "%s"' % filename
 
     # resolved
-    for filename in files:
-        if options.interactive:
+    if options.interactive:
+        for filename in files:
             interactive_merge(filename)
-        resolved(filename, options.reset)
+    resolved(files, options.reset)