X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/751c890baeb20118bcdea0b735c85995b7f588fa..6dd8fafabb5b8e266a85f13c8851ca8a66a1a405:/stgit/commands/resolved.py diff --git a/stgit/commands/resolved.py b/stgit/commands/resolved.py index 1130641..c2ef678 100644 --- a/stgit/commands/resolved.py +++ b/stgit/commands/resolved.py @@ -34,6 +34,7 @@ Mark a merge conflict as resolved. The conflicts can be seen with the 'C'. This command also removes any .{ancestor,current,patched} files.""" +directory = DirectoryHasRepository() options = [make_option('-a', '--all', help = 'mark all conflicts as solved', action = 'store_true'),