[PATCH STABLE] test-rename-merge2: fix test failure on Windows

[Matt Harbison]

# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1429288795 14400
#      Fri Apr 17 12:39:55 2015 -0400
# Branch stable
# Node ID 981165ff54bad156cd5a7259995816c494f828b8
# Parent  a9326b297b68e77c60fba69aeaf17b725ac84923
test-rename-merge2: fix test failure on Windows

Windows and OpenVMS use double quote for shell quoting, posix uses single quote.
Since the other test lines added in 5668202cfaaf don't include the quotes, this
was presumably an oversight.

diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -100,7 +100,7 @@ args:
   picked tool 'python ../merge' for rev (binary False symlink False)
   merging rev
   my rev at e300d1c794ec+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
-  launching merge tool: python ../merge $TESTTMP/t/t/rev '*' '*' (glob)
+  launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
   merge tool returned: 0
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)