tests/bundles/issue4041.hg
author Danek Duvall <danek.duvall@oracle.com>
Mon, 20 Jul 2015 15:33:20 -0700
branchstable
changeset 25861 11ab8714f529
parent 19969 ad9db007656f
permissions -rw-r--r--
tests: use egrep with regular expression branches for compatibility GNU grep allows you to use "a\|b" in a regular expression to match either "a" or "b", but at least Solaris grep does not; only egrep allows for that. And egrep considers "a+" to be "a{1,}" instead of an "a" and a literal plus sign, so escape that as well.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
19969
ad9db007656f rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     1
(binary:application/octet-stream)