summaryrefslogtreecommitdiff
path: root/t/t6025-merge-symlinks.sh
Commit message (Collapse)AuthorAgeFilesLines
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-7/+7
| | | | | | This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix permissions on test scriptsAlex Riesen2007-04-161-0/+0
| | | | | | | | Make every test executable. Remove exec-attribute from included shell files, they can't used standalone anyway. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Handle core.symlinks=false case in merge-recursive.Johannes Sixt2007-03-031-0/+62
If the file system does not support symbolic links (core.symlinks=false), merge-recursive must write the merged symbolic link text into a regular file. While we are here, fix a tiny memory leak in the if-branch that writes real symbolic links. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <junkio@cox.net>