Merge branch 'js/vimdiff-quotepath-fix' into maint

[thirdparty/git.git] / mergetools / vimdiff

diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index f7e7f2702857d0908b4ca278acf2474d77942b74..fa82a8dca6a958efa0afcbed69489ac4e9903c76 100644 (file)
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -635,7 +635,7 @@ run_unit_tests () {
        cat >expect <<-\EOF
        -f
        -c
-       echo | split | vertical split | 1b | wincmd l | vertical split | quit | wincmd l | 2b | wincmd j | 3b | tabdo windo diffthis
+       echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | quit | wincmd l | 2b | wincmd j | 3b | tabdo windo diffthis
        -c
        tabfirst
        lo cal