summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2008-05-20 23:59:32 +0200
committerJunio C Hamano <gitster@pobox.com>2008-05-21 11:20:34 -0700
commit26ec126a9166be39f79e746a3a8c92205c983820 (patch)
tree762dac54cb340f805179b0eba7e4de8d3bad69dc /git-merge.sh
parent4be1fe1b944e568f47efcb9d1beb8639f50b723f (diff)
downloadgit-26ec126a9166be39f79e746a3a8c92205c983820.tar.gz
Fix t3701 if core.filemode disabled
[jc: squashed in suggestions from Jeff King] Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions