Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix t6031 on filesystems without working exec bit
The point of the test is not really to test the ability of the filesystem to keep the given x-bit, but to check is merge-recursive correctly handles it. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information