git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fe9ec8b c6f44e1)

author	Junio C Hamano <redacted>
	Wed, 18 Jan 2017 23:12:15 +0000 (15:12 -0800)
committer	Junio C Hamano <redacted>
	Wed, 18 Jan 2017 23:12:15 +0000 (15:12 -0800)
commit	c7f352f31ad0593f7772a155980b16cbbaac3dec
tree	c64eb97b8d3846244a534e36ba89093c070da124	tree \| snapshot
parent	fe9ec8bdf65657c11f08f8858bb2a707bdf7aafe	commit \| diff
parent	c6f44e1da5e88e34654ae37c62eea2d08835110b	commit \| diff

Merge branch 'pb/test-must-fail-is-for-git'

Test cleanup.

* pb/test-must-fail-is-for-git:
t9813: avoid using pipes
don't use test_must_fail with grep

t/t3510-cherry-pick-sequence.sh	diff1 \|	diff2 \|	blob \| history
t/t7610-mergetool.sh	diff1 \|	diff2 \|	blob \| history

git clone https://git.99rst.org/PROJECT