aboutsummaryrefslogtreecommitdiffstats
path: root/t/t1012-read-tree-df.sh
AgeCommit message (Expand)AuthorFilesLines
2011-05-25Teach read-tree the -n|--dry-run optionJens Lehmann1-4/+5
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano1-4/+4
2010-01-03traverse_trees(): handle D/F conflict case sanelyJunio C Hamano1-2/+2
2010-01-03more D/F conflict testsJunio C Hamano1-0/+102