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
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\""