| commit | c1e0dc59bddce765761a6f863c66ee0cd4b2ca09 | |
| author | Andreas Schwab <schwab@suse.de> | |
| Thu, 10 Nov 2016 08:31:18 +0000 (10 09:31 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Nov 2016 19:20:56 +0000 (10 11:20 -0800) | ||
| tree | e3d777926f35f8f50701733c585e1f3aa625a10f | treesnapshot (tar.gz zip) |
| parent | 734fde2d7167e4b20d2ff6062ade3846949b0741 | commitdiff |
t6026-merge-attr: ensure that the merge driver was called
Explicitly check for the existence of the pid file to test that the
merge driver was actually called.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Explicitly check for the existence of the pid file to test that the
merge driver was actually called.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6026-merge-attr.sh | diffblobblamehistory |