changeset 22046 | 7a9cbb315d84 |
parent 17132 | b87acfda5268 |
child 22502 | e6e7ef68c879 |
--- a/tests/test-changelog-exec.t Wed Aug 06 10:34:54 2014 -0500 +++ b/tests/test-changelog-exec.t Wed Aug 06 11:43:59 2014 -0500 @@ -1,9 +1,9 @@ +#require execbit + b51a8138292a introduced a regression where we would mention in the changelog executable files added by the second parent of a merge. Test that that doesn't happen anymore - $ "$TESTDIR/hghave" execbit || exit 80 - $ hg init repo $ cd repo $ echo foo > foo