summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
AgeCommit message (Expand)AuthorFilesLines
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2012-12-09Which merge_file() function do you mean?Libravatar Junio C Hamano1-2/+2
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-2/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+111