summaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
AgeCommit message (Expand)AuthorFilesLines
2013-06-07t6035: use test_ln_s_add to remove SYMLINKS prerequisiteLibravatar Johannes Sixt1-26/+47
2011-02-21do not overwrite untracked symlinksLibravatar Clemens Buchacher1-3/+11
2010-09-04Merge branch 'ab/test-2'Libravatar Junio C Hamano1-22/+16
2010-08-31Merge branch 'en/d-f-conflict-fix'Libravatar Junio C Hamano1-4/+60
2010-08-18tests: implicitly skip SYMLINKS tests using <prereq>Libravatar Ævar Arnfjörð Bjarmason1-13/+7
2010-07-27t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing testLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-07-09merge-recursive: Fix D/F conflictsLibravatar Elijah Newren1-3/+3
2010-07-09Add additional testcases for D/F conflictsLibravatar Elijah Newren1-4/+60
2010-06-25tests: Skip tests in a way that makes sense under TAPLibravatar Ævar Arnfjörð Bjarmason1-1/+1
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 21:34:27 +0000