Mercurial > hg
comparison tests/test-rename-merge2.t @ 24808:d05ede9d3ecc stable
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.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Fri, 17 Apr 2015 12:39:55 -0400 |
| parents | 5668202cfaaf |
| children | eea3977e6fca |
comparison
equal
deleted
inserted
replaced
| 24807:fff8b779e63a | 24808:d05ede9d3ecc |
|---|---|
| 98 rev: versions differ -> m | 98 rev: versions differ -> m |
| 99 updating: rev 2/2 files (100.00%) | 99 updating: rev 2/2 files (100.00%) |
| 100 picked tool 'python ../merge' for rev (binary False symlink False) | 100 picked tool 'python ../merge' for rev (binary False symlink False) |
| 101 merging rev | 101 merging rev |
| 102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 103 launching merge tool: python ../merge $TESTTMP/t/t/rev '*' '*' (glob) | 103 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
| 104 merge tool returned: 0 | 104 merge tool returned: 0 |
| 105 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 105 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 106 (branch merge, don't forget to commit) | 106 (branch merge, don't forget to commit) |
| 107 -------------- | 107 -------------- |
| 108 M b | 108 M b |