Merge branch 'stable'

[stgit] / stgit / commands / clean.py

diff --git a/stgit/commands/clean.py b/stgit/commands/clean.py
index 889c1dc356b480b081c0533052e0fedf4970aa82..a5effb61cbc70c46724c1ba84c6955f4c26a9f73 100644 (file)
--- a/stgit/commands/clean.py
+++ b/stgit/commands/clean.py
@@ -37,7 +37,7 @@ options = [make_option('-a', '--applied',
 
 
 def _clean(stack, clean_applied, clean_unapplied):
-    trans = transaction.StackTransaction(stack, 'stg clean')
+    trans = transaction.StackTransaction(stack, 'clean', allow_conflicts = True)
     def del_patch(pn):
         if pn in stack.patchorder.applied:
             if pn == stack.patchorder.applied[-1]: