Merge branch 'maint'

[git.git] / t / t1002-read-tree-m-u-2way.sh

diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index da3c81357b8ffee7d6fc3f2d4301e9c3c9d076fd..87fe993f59e2b3843ea2abcd92a2bab77a392997 100755 (executable)
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -16,7 +16,7 @@ compare_change () {
        sed >current \
            -e '/^--- /d; /^+++ /d; /^@@ /d;' \
            -e 's/^\(.[0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /' "$1"
-       diff -u expected current
+       git diff expected current
 }
 
 check_cache_at () {