X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgbp-orig;h=9a4937cb1e6f0fc91a9fd6a17d8152d45a13c709;hb=98f0b776adea78bc0f4c379a8e956a3cb69046ae;hp=29dd4570848b7234efdb7619e8771e2e99da0321;hpb=06398ebf1c535adf0aa818f8a3540fe1a0ce30b4;p=dgit.git diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig index 29dd4570..9a4937cb 100755 --- a/tests/tests/gbp-orig +++ b/tests/tests/gbp-orig @@ -38,7 +38,7 @@ git commit -m 'Import 1.0' git tag upstream/1.0 git checkout quilt-tip -t-git-pseudo-merge upstream +t-git-pseudo-merge -m 'gbp-orig pseudomerge' upstream v=1.0-1 @@ -74,4 +74,4 @@ done cd $tmp diff -ruN gbp-output/tar-x tar-x -echo done. +t-ok