git-debrebase: merge: conflict: Some xxx's now done

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index f9b6254ded2f808246e2bda44395b373aa0ed59a..41373f3e82f4083291bb74f586ba229303b799ef 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -373,9 +373,6 @@ sub gbp_pq_export ($$$) {
 # xxx general gdr docs highlight forbidden things
 # xxx general gdr docs list allowable things ?
 # xxx general gdr docs explicitly forbid some rebase
-#
-# xxx provide a way for the user to help
-# xxx (eg, provide wreckage provide way to continue)
 
 # later/rework?
 #  use git-format-patch?