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

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 2e027f5f714bbcd7304cb95801eced0f88edf34e..bee0249753880600bfd2f7834bde3126ed3fecb5 100755 (executable)
--- 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;