| commit | 2f69de5b4be64100d919b2ac858ca60263a59bb2 | |
| author | Jeff King <peff@peff.net> | |
| Fri, 20 Mar 2015 10:13:15 +0000 (20 06:13 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Mar 2015 18:35:56 +0000 (20 11:35 -0700) | ||
| tree | 4fea8edf614da4e0746a84c6efebefcb2e0b5fc4 | treesnapshot (tar.gz zip) |
| parent | 95508a075181397ae1040e75116a42af89dc0155 | commitdiff |
t6034: use modern test_* helpers
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>
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>
| t/t6034-merge-rename-nocruft.sh | diffblobblamehistory |