diff options
| author |  Alex Riesen <raa.lkml@gmail.com> | 2008-05-18 16:57:27 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-05-21 10:14:51 -0700 |
| commit | 28f880241782024ecb212f1641c8dc487124523b (patch) | |
| tree | 094ead4e8c18f09c62dc9c1f6cfc5bb2559a6a26 /combine-diff.c | |
| parent | Fix prepare-commit-msg hook and replace in-place sed (diff) | |
| download | tgif-28f880241782024ecb212f1641c8dc487124523b.tar.xz | |
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>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions