Merge branch 'pb/test-must-fail-is-for-git'
authorJunio C Hamano <redacted>
Wed, 18 Jan 2017 23:12:15 +0000 (15:12 -0800)
committerJunio C Hamano <redacted>
Wed, 18 Jan 2017 23:12:15 +0000 (15:12 -0800)
Test cleanup.

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

1  2 
t/t3510-cherry-pick-sequence.sh
t/t7610-mergetool.sh

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