aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.c
Commit message (Expand)AuthorAge
* use xstrdup, not strdup in ll-merge.cJim Meyering2009-06-14
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-18