From: Karl Hasselström <kha@treskal.com>
Date: Wed, 19 Dec 2007 18:00:13 +0000 (+0000)
Subject: We keep the different stages of a conflict in the index now
X-Git-Tag: v0.15-rc1~331
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/785552feb825d6ff07c20f981ad00991f13f471e?ds=sidebyside

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 792dee5..adc591f 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'."""
 
 directory = DirectoryHasRepository(needs_current_series = False)
 options = [make_option('-a', '--all',