changeset 42665: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 f59f8a5e9096
children 7521e6d18057
files tests/test-merge-combination.t
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge-combination.t	Mon Aug 12 14:00:19 2019 -0400
+++ b/tests/test-merge-combination.t	Fri Aug 16 15:41:53 2019 +0300
@@ -57,7 +57,7 @@
   >                fi
   >           else expected=a
   >           fi
-  >           got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '`
+  >           got=`hg log -r 3 --template '{files}\n' | tr -d 'e '`
   >           if [ "$got" = "$expected" ]
   >           then echo "$line$conflicts: agree on \"$got\""
   >           else echo "$line$conflicts: hg said \"$got\", expected \"$expected\""