author | Matt Mackall <mpm@selenic.com> |
Thu, 01 Nov 2012 14:59:55 -0500 | |
branch | stable |
changeset 17902 | 195ad823b5d5 |
parent 17901 | a19046744e4e |
child 17903 | 132a288f32d5 |
--- a/tests/test-merge-tools.t Tue Oct 30 17:23:51 2012 -0700 +++ b/tests/test-merge-tools.t Thu Nov 01 14:59:55 2012 -0500 @@ -774,8 +774,10 @@ 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) -#if no-windows +#if unix-permissions $ beforemerge [merge-tools] false.whatever=