summaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
Commit message (Expand)AuthorAgeFilesLines
* Collect merge-related tests to t64xxElijah Newren2020-08-101-172/+0
* t6020, t6022, t6035: update merge tests to use test helper functionsElijah Newren2020-02-271-14/+14
* t6035: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-26/+47
* do not overwrite untracked symlinksClemens Buchacher2011-02-211-3/+11
* Merge branch 'ab/test-2'Junio C Hamano2010-09-041-22/+16
|\
| * tests: implicitly skip SYMLINKS tests using <prereq>Ævar Arnfjörð Bjarmason2010-08-181-13/+7
* | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-311-4/+60
|\ \ | |/ |/|
| * t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing testÆvar Arnfjörð Bjarmason2010-07-271-1/+1
| * merge-recursive: Fix D/F conflictsElijah Newren2010-07-091-3/+3
| * Add additional testcases for D/F conflictsElijah Newren2010-07-091-4/+60
* | tests: Skip tests in a way that makes sense under TAPÆvar Arnfjörð Bjarmason2010-06-251-1/+1
|/
* 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
View Lorry Controller Status