summaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: update tests that used to failJunio C Hamano2010-01-281-1/+1
* Aggressive three-way merge: fix D/F caseJunio C Hamano2010-01-031-1/+1
* traverse_trees(): handle D/F conflict case sanelyJunio C Hamano2010-01-031-1/+1
* t6035-merge-dir-to-symlink depends on SYMLINKS prerequisiteJohannes Sixt2009-08-091-0/+6
* git-checkout: be careful about untracked symlinksLinus Torvalds2009-07-291-1/+1
* lstat_cache: guard against full match of length of 'name' parameterKjetil Barvik2009-07-291-1/+1
* Demonstrate bugs when a directory is replaced with a symlinkPickens, James E2009-07-291-0/+87