Merge branch 'jc/t5601-copy-workaround' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:04:56 +0000 (12:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:04:56 +0000 (12:04 +0900)
commit2e138796d82794f5bb2bccee8680b10346953518
treee3154fb1e55df08df3efd005720d121ad9e3a435
parentadfc49e60bb1ae4e1239d8fd5d35127de160058b
parentcff48ccf2a4fefab6f87b1b6ec9ec63595d88175
Merge branch 'jc/t5601-copy-workaround' into maint

A (possibly flakey) test fix.

* jc/t5601-copy-workaround:
  t5601: rm the target file of cp that could still be executing