summaryrefslogtreecommitdiff
path: root/t/t1012-read-tree-df.sh
Commit message (Expand)AuthorAgeFilesLines
* unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-071-4/+4
* traverse_trees(): handle D/F conflict case sanelyJunio C Hamano2010-01-031-2/+2
* more D/F conflict testsJunio C Hamano2010-01-031-0/+102