summaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
AgeCommit message (Expand)Author
2011-02-22do not overwrite untracked symlinksClemens Buchacher
2010-09-04Merge branch 'ab/test-2'Junio C Hamano
2010-08-31Merge branch 'en/d-f-conflict-fix'Junio C Hamano
2010-08-18tests: implicitly skip SYMLINKS tests using <prereq>Ævar Arnfjörð Bjarmason
2010-07-27t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing testÆvar Arnfjörð Bjarmason
2010-07-09merge-recursive: Fix D/F conflictsElijah Newren
2010-07-09Add additional testcases for D/F conflictsElijah Newren
2010-06-25tests: Skip tests in a way that makes sense under TAPÆvar Arnfjörð Bjarmason
2010-01-28tests: update tests that used to failJunio C Hamano
2010-01-04Aggressive three-way merge: fix D/F caseJunio C Hamano
2010-01-04traverse_trees(): handle D/F conflict case sanelyJunio C Hamano
2009-08-09t6035-merge-dir-to-symlink depends on SYMLINKS prerequisiteJohannes Sixt
2009-07-30git-checkout: be careful about untracked symlinksLinus Torvalds
2009-07-30lstat_cache: guard against full match of length of 'name' parameterKjetil Barvik
2009-07-30Demonstrate bugs when a directory is replaced with a symlinkPickens, James E