t6034: use modern test_* helpers
authorJeff King <peff@peff.net>
Fri, 20 Mar 2015 10:13:15 +0000 (06:13 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 18:35:56 +0000 (11:35 -0700)
These say roughly the same thing as the hand-rolled
messages. We do lose the "merge did not complete" debug
message, but merge and write-tree are prefectly capable of
writing useful error messages when they fail.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found