From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 5 Oct 2005 08:32:08 +0000 (+0100)
Subject: 'status --reset' should remove the conflicts as well
X-Git-Tag: v0.14.3~638
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/3c3e0344d3b9f2626a31105f9f794142ed4a8dfa

'status --reset' should remove the conflicts as well

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---

diff --git a/stgit/commands/status.py b/stgit/commands/status.py
index 4283df8..bd3edfb 100644
--- a/stgit/commands/status.py
+++ b/stgit/commands/status.py
@@ -67,6 +67,7 @@ def func(parser, options, args):
     """Show the tree status
     """
     if options.reset:
+        resolved_all()
         git.reset()
     else:
         git.status(args, options.modified, options.new, options.deleted,