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
| File | Mode | Size |
|---|---|---|
| xdiff.h | -rw-r--r-- | 3.6 KB |
| xdiffi.c | -rw-r--r-- | 16.5 KB |
| xdiffi.h | -rw-r--r-- | 2.0 KB |
| xemit.c | -rw-r--r-- | 7.6 KB |
| xemit.h | -rw-r--r-- | 1.2 KB |
| xhistogram.c | -rw-r--r-- | 9.0 KB |
| xinclude.h | -rw-r--r-- | 1.2 KB |
| xmacros.h | -rw-r--r-- | 1.9 KB |
| xmerge.c | -rw-r--r-- | 17.0 KB |
| xpatience.c | -rw-r--r-- | 9.9 KB |
| xprepare.c | -rw-r--r-- | 12.0 KB |
| xprepare.h | -rw-r--r-- | 1.1 KB |
| xtypes.h | -rw-r--r-- | 1.6 KB |
| xutils.c | -rw-r--r-- | 11.0 KB |
| xutils.h | -rw-r--r-- | 1.8 KB |
Computing file changes ...
