Revision b36b716cf611dea0054afef55241c88b99399571 authored by Junio C Hamano on 10 November 2016, 23:55:13 UTC, committed by Junio C Hamano on 10 November 2016, 23:55:13 UTC
This reverts commit 734fde2d7167e4b20d2ff6062ade3846949b0741. The point of the test is that the stray process was still running when 'git merge' did its thing through its completion, so a failure to "kill" it means we didn't give a condition to the test to trigger a possible future breakage. Appending "|| :" to the "kill" is sweeping a test-bug under the rug.
1 parent 3b03097
Computing file changes ...