Merge git-gui 0.11.0

diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index c5dbc724b6da5ad3cc4bbac2925a76ba6a57363c..4db4ac44c9611398db46dfbe2688c95e3b03605b 100755 (executable)
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -66,7 +66,7 @@ test_expect_success 'check hash-object' '
 
 test_expect_success 'check cat-file' '
        git cat-file blob $SHA >actual &&
-       diff -u bar actual
+       test_cmp bar actual
 '
 
 test_expect_success 'check update-index' '