X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;h=420495a711ecb9736e7bfb338704c9119c40a8dc;hp=ab57a1e35b73dbb17ef87d5875afa2e4dc4b3379;hb=5ad9edffc1e0658f287b45feccbd7c97e0bfd412;hpb=11f20779c3a2d56ebdf9430737b7960bd628b16d

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index ab57a1e3..420495a7 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -95,4 +95,23 @@ t-git-debrebase
 
 wreckage-after
 
+: ----- resolve the conflict -----
+
+# omg
+git checkout debrebase-wreckage/merged-patchqueue
+QUILT_PATCHES=debian/patches quilt push -a
+QUILT_PATCHES=debian/patches quilt refresh
+git add debian/patches
+git commit -m FIX
+git reset --hard
+git clean -xdff
+
+t-expect-fail F:todo \
+t-git-debrebase record-resolved-merge
+
+git checkout master
+
+#t-git-debrebase
+#t-gdr-good laundered
+
 t-ok