aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
Commit message (Expand)AuthorAge
* Which merge_file() function do you mean?Junio C Hamano2012-12-09
* Fix sparse warningsStephen Boyd2011-03-22
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22