hooks-pre-commit: use \t, rather than a literal TAB in regexp
[gitweb.git] / t / t5515-fetch-merge-logic.sh
index 0b600bb429b69df02d971913e4b658bf7e313277..31c108161781165d5e32f08b95089086627eda64 100755 (executable)
@@ -84,8 +84,7 @@ test_expect_success setup '
                git config branch.br-$remote-merge.merge refs/heads/three &&
                git config branch.br-$remote-octopus.remote $remote &&
                git config branch.br-$remote-octopus.merge refs/heads/one &&
-               git config --add branch.br-$remote-octopus.merge two &&
-               git config --add branch.br-$remote-octopus.merge remotes/rem/three
+               git config --add branch.br-$remote-octopus.merge two
        done
 '
 
@@ -149,7 +148,7 @@ do
                } >"$actual" &&
                if test -f "$expect"
                then
-                       diff -u "$expect" "$actual" &&
+                       git diff -u "$expect" "$actual" &&
                        rm -f "$actual"
                else
                        # this is to help developing new tests.