Mercurial > hg
comparison tests/test-merge-combination.t @ 42739:302dbc9d52be stable
tests: use `tr -d` and not `tr --delete` as the latter is absent on BSD tr(1)
Differential Revision: https://phab.mercurial-scm.org/D6729
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 16 Aug 2019 15:41:53 +0300 |
parents | 99ebde4fec99 |
children | 8045e4aa366b |
comparison
equal
deleted
inserted
replaced
42715:f59f8a5e9096 | 42739:302dbc9d52be |
---|---|
55 > then expected= | 55 > then expected= |
56 > else expected=a | 56 > else expected=a |
57 > fi | 57 > fi |
58 > else expected=a | 58 > else expected=a |
59 > fi | 59 > fi |
60 > got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '` | 60 > got=`hg log -r 3 --template '{files}\n' | tr -d 'e '` |
61 > if [ "$got" = "$expected" ] | 61 > if [ "$got" = "$expected" ] |
62 > then echo "$line$conflicts: agree on \"$got\"" | 62 > then echo "$line$conflicts: agree on \"$got\"" |
63 > else echo "$line$conflicts: hg said \"$got\", expected \"$expected\"" | 63 > else echo "$line$conflicts: hg said \"$got\", expected \"$expected\"" |
64 > fi | 64 > fi |
65 > cd ../ | 65 > cd ../ |