From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 19:31:41 +0000 (+0100)
Subject: git-debrebase: Merge: Put off some xxx's, making them MERGE-TODO
X-Git-Tag: archive/debian/6.7~26
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8d7ae3032f607936deb0b63109b710eb4381aa55;p=dgit.git

git-debrebase: Merge: Put off some xxx's, making them MERGE-TODO

We are going to release with this machinery in this experimental
state.

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

diff --git a/git-debrebase b/git-debrebase
index 2e027f5f..bee02497 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -446,7 +446,7 @@ sub gbp_pq_export ($$$) {
 }
 
 
-# xxx allow merge resolution separately from laundering, before git merge
+# MERGE-TODO allow merge resolution separately from laundering, before git merge
 
 # later/rework?
 #  use git-format-patch?
@@ -1308,7 +1308,7 @@ sub walk ($;$$$) {
 	    # which was reachable via ffq-prev is no longer findable.
 	    # This is suboptimal, but if it all works we'll have done
 	    # the right thing.
-	    # xxx we should warn the user in the docs about this
+	    # MERGE-TODO we should warn the user in the docs about this
 
 	    my $ok=1;
 	    my $best_anchor;
@@ -2757,7 +2757,7 @@ END
 
 sub cmd_record_resolved_merge () {
     badusage "record-resolved-merge takes no further arguments" if @ARGV;
-    # xxx needs documentation
+    # MERGE-TODO needs documentation
     my $new = get_head();
     my $method;