Re-add the interactive merge

[stgit] / stgit / commands / status.py

diff --git a/stgit/commands/status.py b/stgit/commands/status.py
index 370e0332a6ad968e928b98c50e30f85f71fe809b..708dd161d265c2ce6bf4fdb8385fc8913286d253 100644 (file)
--- a/stgit/commands/status.py
+++ b/stgit/commands/status.py
@@ -109,7 +109,8 @@ def func(parser, options, args):
 
     if options.reset:
         if args:
 
     if options.reset:
         if args:

-            resolved(args)
+            conflicts = git.get_conflicts()
+            git.resolved(fn for fn in args if fn in conflicts)

             git.reset(args)
         else:
             resolved_all()
             git.reset(args)
         else:
             resolved_all()