diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t index 47fb48060e362d13b282144c83f13442d3f57adc_dGVzdHMvdGVzdC1tZXJnZS10b29scy50..a19046744e4e987847f0faea74241ff5dc68533c_dGVzdHMvdGVzdC1tZXJnZS10b29scy50 100644 --- a/tests/test-merge-tools.t +++ b/tests/test-merge-tools.t @@ -775,6 +775,7 @@ Issue3581: Merging a filename that needs to be quoted +#if no-windows $ beforemerge [merge-tools] false.whatever= @@ -796,6 +797,7 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg update -C 1 > /dev/null +#endif Merge post-processing