aboutsummaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
Commit message (Expand)AuthorAge
* tests: Skip tests in a way that makes sense under TAPÆvar Arnfjörð Bjarmason2010-06-25
* tests: update tests that used to failJunio C Hamano2010-01-28
* Aggressive three-way merge: fix D/F caseJunio C Hamano2010-01-03
* traverse_trees(): handle D/F conflict case sanelyJunio C Hamano2010-01-03
* t6035-merge-dir-to-symlink depends on SYMLINKS prerequisiteJohannes Sixt2009-08-09
* git-checkout: be careful about untracked symlinksLinus Torvalds2009-07-29
* lstat_cache: guard against full match of length of 'name' parameterKjetil Barvik2009-07-29
* Demonstrate bugs when a directory is replaced with a symlinkPickens, James E2009-07-29