summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-19 20:22:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-19 20:22:20 (GMT)
commit39cadeec0db35a79a2713eceaf998f2745236f0c (patch)
tree312bde8b243be7d36b46ce8f3f686ecb1793781d /builtin/merge.c
parentd4c6375fd8996d7d809fb34b9743339d7192c58b (diff)
parent03c39b34589897824385c884cd9c5707ba93a238 (diff)
downloadgit-39cadeec0db35a79a2713eceaf998f2745236f0c.zip
git-39cadeec0db35a79a2713eceaf998f2745236f0c.tar.gz
git-39cadeec0db35a79a2713eceaf998f2745236f0c.tar.bz2
Merge branch 'jk/test-match-signal'
The test framework learned a new helper test_match_signal to check an exit code from getting killed by an expected signal. * jk/test-match-signal: t/lib-git-daemon: use test_match_signal test_must_fail: use test_match_signal t0005: use test_match_signal as appropriate tests: factor portable signal check out of t0005
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions