summaryrefslogtreecommitdiff
path: root/ll-merge.c
AgeCommit message (Expand)AuthorFilesLines
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-2/+2
2008-02-18merge-recursive: split low-level merge functions out.Libravatar Junio C Hamano1-0/+379