summaryrefslogtreecommitdiff
path: root/vcs-svn/svndiff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-11-11 13:56:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-11 13:56:30 -0800
commitf5a8ad4c5a2c89555b728ccbaad04bf416cc4274 (patch)
tree3f38bde5dd0bf9e612131ad94440e10a41cb97d5 /vcs-svn/svndiff.c
parentMerge branch 'jk/alt-odb-cleanup' (diff)
parentt6026: clarify the point of "kill $(cat sleep.pid)" (diff)
downloadtgif-f5a8ad4c5a2c89555b728ccbaad04bf416cc4274.tar.xz
Merge branch 'as/merge-attr-sleep'
Fix for a racy false-positive test failure. * as/merge-attr-sleep: t6026: clarify the point of "kill $(cat sleep.pid)" t6026: ensure that long-running script really is Revert "t6026-merge-attr: don't fail if sleep exits early" Revert "t6026-merge-attr: ensure that the merge driver was called" t6026-merge-attr: ensure that the merge driver was called t6026-merge-attr: don't fail if sleep exits early
Diffstat (limited to 'vcs-svn/svndiff.c')
0 files changed, 0 insertions, 0 deletions