projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 734fde2) | patch
t6026-merge-attr: ensure that the merge driver was called
authorAndreas Schwab <schwab@suse.de>
Thu, 10 Nov 2016 08:31:18 +0000 (09:31 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Nov 2016 19:20:56 +0000 (11:20 -0800)
commitc1e0dc59bddce765761a6f863c66ee0cd4b2ca09
treee3d777926f35f8f50701733c585e1f3aa625a10ftree | snapshot
parent734fde2d7167e4b20d2ff6062ade3846949b0741commit | diff
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>
t/t6026-merge-attr.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.