We keep the different stages of a conflict in the index now

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/resolved.py b/stgit/commands/resolved.py
index 792dee51669ec33f202771775bf1eb875fe16c6a..adc591fc31c4ace484b6a1db42711d8932617376 100644 (file)
--- 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
 
 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'."""

 
 directory = DirectoryHasRepository(needs_current_series = False)
 options = [make_option('-a', '--all',
 
 directory = DirectoryHasRepository(needs_current_series = False)
 options = [make_option('-a', '--all',