fetch: if not fetching from default remote, ignore default merge

[git.git] / t / t4118-apply-empty-context.sh

diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh
index e78b1a1a79069c70f23f4f71c9aa7305e128fd3f..1d531caf798b9e8dfbe17714ad1eb09be14f7f93 100755 (executable)
--- a/t/t4118-apply-empty-context.sh
+++ b/t/t4118-apply-empty-context.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Junio C Hamano
 #
 
-test_description='git-apply with new style GNU diff with empty context
+test_description='git apply with new style GNU diff with empty context
 
 '
 
@@ -38,7 +38,7 @@ test_expect_success 'apply --numstat' '
                echo "0 1       file1" &&
                echo "0 1       file2"
        } >expect &&
-       diff -u expect actual
+       git diff expect actual
 
 '
 
@@ -48,9 +48,8 @@ test_expect_success 'apply --apply' '
        cat file2.orig >file2 &&
        git update-index file1 file2 &&
        git apply --index diff.output &&
-       diff -u file1.mods file1 &&
-       diff -u file2.mods file2
+       git diff file1.mods file1 &&
+       git diff file2.mods file2
 '
 
 test_done
-