git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4be1fe1)
Fix t6031 on filesystems without working exec bit
authorAlex Riesen <redacted>
Sun, 18 May 2008 14:57:27 +0000 (16:57 +0200)
committerJunio C Hamano <redacted>
Wed, 21 May 2008 17:14:51 +0000 (10:14 -0700)
commit28f880241782024ecb212f1641c8dc487124523b
tree094ead4e8c18f09c62dc9c1f6cfc5bb2559a6a26tree | snapshot
parent4be1fe1b944e568f47efcb9d1beb8639f50b723fcommit | 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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t6031-merge-recursive.sh diff | blob | history
git clone https://git.99rst.org/PROJECT