Merge branch 'maint'

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 219411fd02f92a6af5f226912971ca43ae020003..56869aceeda90281a9fed992d0b202ec03fcb9f9 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -108,7 +108,7 @@ create_merge_msgs() {
 }
 
 verify_diff() {
-       if ! diff -u "$1" "$2"
+       if ! test_cmp "$1" "$2"
        then
                echo "$3"
                false