Patchwork D6729: tests: use `tr -d` and not `tr --delete` since the latter is absent on BSD tr(1)

login
register
mail settings
Submitter phabricator
Date Aug. 15, 2019, 3:23 p.m.
Message ID <differential-rev-PHID-DREV-qjryzj4djob3drkarewm-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/41302/
State Superseded
Headers show

Comments

phabricator - Aug. 15, 2019, 3:23 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6729

AFFECTED FILES
  tests/test-merge-combination.t

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-merge-combination.t b/tests/test-merge-combination.t
--- a/tests/test-merge-combination.t
+++ b/tests/test-merge-combination.t
@@ -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\""