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

diff --cc t/t3510-cherry-pick-sequence.sh
Simple merge

diff --cc t/t7610-mergetool.sh
Simple merge