Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx>
---
stgit/commands/resolved.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/stgit/commands/resolved.py b/stgit/commands/resolved.py
index d524d51..0b3ab81 100644
--- a/stgit/commands/resolved.py
+++ b/stgit/commands/resolved.py
@@ -31,8 +31,7 @@ usage = """%prog [options] [<files...>]
Mark a merge conflict as resolved. The conflicts can be seen with the
'status' command, the corresponding files being prefixed with a
-'C'. This command also removes any <file>.{ancestor,current,patched}
-files."""
+'C'."""
options = [make_option('-a', '--all',
help = 'mark all conflicts as solved',
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
