summaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
AgeCommit message (Expand)AuthorFilesLines
2010-01-28tests: update tests that used to failLibravatar Junio C Hamano1-1/+1
2010-01-03Aggressive three-way merge: fix D/F caseLibravatar Junio C Hamano1-1/+1
2010-01-03traverse_trees(): handle D/F conflict case sanelyLibravatar Junio C Hamano1-1/+1
2009-08-09t6035-merge-dir-to-symlink depends on SYMLINKS prerequisiteLibravatar Johannes Sixt1-0/+6
2009-07-29git-checkout: be careful about untracked symlinksLibravatar Linus Torvalds1-1/+1
2009-07-29lstat_cache: guard against full match of length of 'name' parameterLibravatar Kjetil Barvik1-1/+1
2009-07-29Demonstrate bugs when a directory is replaced with a symlinkLibravatar Pickens, James E1-0/+87