Merge branch 'sb/submodule-url-to-absolute'

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 668bbee73c8dc58c6ba61c4a8002ed68206d1445..562bd215a5315757dcc7c10e311106f2c7b0ff72 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -557,7 +557,7 @@ test_expect_success SYMLINKS 'difftool --dir-diff --symlink without unstaged cha
        EOF
        git difftool --dir-diff --symlink \
                --extcmd "./.git/CHECK_SYMLINKS" branch HEAD &&
-       test_cmp actual expect
+       test_cmp expect actual
 '
 
 write_script modify-right-file <<\EOF