diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t index a19046744e4e987847f0faea74241ff5dc68533c_dGVzdHMvdGVzdC1tZXJnZS10b29scy50..195ad823b5d58c68903a6153a25e3fb4ed25239d_dGVzdHMvdGVzdC1tZXJnZS10b29scy50 100644 --- a/tests/test-merge-tools.t +++ b/tests/test-merge-tools.t @@ -774,4 +774,6 @@ M f Issue3581: Merging a filename that needs to be quoted +(This test doesn't work on Windows filesystems even on Linux, so check +for Unix-like permission) @@ -777,5 +779,5 @@ -#if no-windows +#if unix-permissions $ beforemerge [merge-tools] false.whatever=