aboutsummaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
Commit message (Expand)AuthorAge
* do not overwrite untracked symlinksClemens Buchacher2011-02-21
* Merge branch 'ab/test-2'Junio C Hamano2010-09-04
|\
| * tests: implicitly skip SYMLINKS tests using <prereq>Ævar Arnfjörð Bjarmason2010-08-18
* | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-31
|\ \ | |/ |/|
| * t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing testÆvar Arnfjörð Bjarmason2010-07-27
| * merge-recursive: Fix D/F conflictsElijah Newren2010-07-09
| * Add additional testcases for D/F conflictsElijah Newren2010-07-09
* | 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