X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/719309aa54c8fa43bd8700f09b1e293923ed4e0a..f249607484ed865696bd96a2055468b98b4e319f:/t/t2800-goto-subdir.sh?ds=sidebyside diff --git a/t/t2800-goto-subdir.sh b/t/t2800-goto-subdir.sh index fcad7da..28b8292 100755 --- a/t/t2800-goto-subdir.sh +++ b/t/t2800-goto-subdir.sh @@ -27,9 +27,9 @@ EOF test_expect_success 'Goto in subdirectory (just pop)' ' (cd foo && stg goto p1) && cat foo/bar > actual.txt && - diff -u expected1.txt actual.txt && + test_cmp expected1.txt actual.txt && ls foo > actual.txt && - diff -u expected2.txt actual.txt + test_cmp expected2.txt actual.txt ' test_expect_success 'Prepare conflicting goto' ' @@ -51,9 +51,9 @@ test_expect_success 'Goto in subdirectory (conflicting push)' ' (cd foo && stg goto p3) ; [ $? -eq 3 ] && cat foo/bar > actual.txt && - diff -u expected1.txt actual.txt && + test_cmp expected1.txt actual.txt && ls foo > actual.txt && - diff -u expected2.txt actual.txt + test_cmp expected2.txt actual.txt ' test_done