From 3c3e0344d3b9f2626a31105f9f794142ed4a8dfa Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 5 Oct 2005 09:32:08 +0100 Subject: [PATCH] 'status --reset' should remove the conflicts as well Signed-off-by: Catalin Marinas --- stgit/commands/status.py | 1 + 1 file changed, 1 insertion(+) 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, -- 2.11.0