![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Sun, 18 May 2008 14:57:27 +0000 (16:57 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 May 2008 17:14:51 +0000 (10:14 -0700) | ||
| commit | 28f880241782024ecb212f1641c8dc487124523b | |
| tree | 094ead4e8c18f09c62dc9c1f6cfc5bb2559a6a26 | tree | snapshot |
| parent | 4be1fe1b944e568f47efcb9d1beb8639f50b723f | commit | diff |
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>
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>
| t/t6031-merge-recursive.sh | diff | blob | history |