From: Junio C Hamano Date: Fri, 11 Nov 2016 21:56:30 +0000 (-0800) Subject: Merge branch 'as/merge-attr-sleep' X-Git-Tag: v2.11.0-rc1~7 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f5a8ad4c5a2c89555b728ccbaad04bf416cc4274?ds=inline;hp=--cc 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 --- f5a8ad4c5a2c89555b728ccbaad04bf416cc4274