Mercurial > hg
changeset 41712:88d4477ac4f6
tests: add more wildcards to test-extdiff.t
The diff tool (which is `echo`) runs in the background and output
order can therefore be non-deterministic. We need to glob over
the file names to account for this.
Differential Revision: https://phab.mercurial-scm.org/D5976
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 15 Feb 2019 13:46:30 -0800 |
| parents | 544035846830 |
| children | 9de6c4f61608 |
| files | tests/test-extdiff.t |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-extdiff.t Fri Feb 15 13:22:01 2019 -0800 +++ b/tests/test-extdiff.t Fri Feb 15 13:46:30 2019 -0800 @@ -167,8 +167,8 @@ Test --per-file option for gui tool again: $ hg --config merge-tools.alabalaf.gui=True alabalaf -c 6 --per-file --debug - diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) - diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) + diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob) + diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob) making snapshot of 2 files from rev 46c0e4daeb72 a b