diff options
| author |  Andreas Schwab <schwab@suse.de> | 2016-11-10 09:31:18 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-11-10 11:20:56 -0800 |
| commit | c1e0dc59bddce765761a6f863c66ee0cd4b2ca09 (patch) | |
| tree | e3d777926f35f8f50701733c585e1f3aa625a10f /contrib/examples/git-pull.sh | |
| parent | t6026-merge-attr: don't fail if sleep exits early (diff) | |
| download | tgif-c1e0dc59bddce765761a6f863c66ee0cd4b2ca09.tar.xz | |
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>
Diffstat (limited to 'contrib/examples/git-pull.sh')
0 files changed, 0 insertions, 0 deletions