Merge branch 'jn/merge-custom-no-trivial'

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 8fe14ccc5444df95960bee88e5b79eb68156572b..62e208aadd592ddaa5c519cf328e636d948221c0 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -81,7 +81,7 @@ test_expect_success 'drop top stash' '
        git stash &&
        git stash drop &&
        git stash list > stashlist2 &&
-       diff stashlist1 stashlist2 &&
+       test_cmp stashlist1 stashlist2 &&
        git stash apply &&
        test 3 = $(cat file) &&
        test 1 = $(git show :file) &&