##// END OF EJS Templates
tests: use `tr -d` and not `tr --delete` as the latter is absent on BSD tr(1)...
Augie Fackler -
r42990:302dbc9d stable
parent child Browse files
Show More
@@ -57,7 +57,7 b' revision. "C" indicates that hg merge ha'
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\""
General Comments 0
You need to be logged in to leave comments. Login now