X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;h=666672faa82ac01fbf8ee07f37a26f78dfdb25e5;hp=baffedfc8722ba8becd599b6993e6d84839653d5;hb=965fdfed6e03d38b273baf1fa282a3d2ef828484;hpb=e8ab02477159b5bd91a3566dc28367ed4a910b3a diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge index baffedfc..666672fa 100755 --- a/tests/tests/gdr-merge +++ b/tests/tests/gdr-merge @@ -54,12 +54,13 @@ t-git-debrebase export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1 t-git-debrebase +t-gdr-good laundered +t-git-debrebase +t-gdr-good laundered t-git-debrebase scrap t-some-changes after t-git-debrebase - -# t-gdr-good laundered -# xxx ^ this does not work +t-gdr-good laundered t-ok