summaryrefslogtreecommitdiff
path: root/ll-merge.c
Commit message (Expand)AuthorAgeFilesLines
* replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-291-1/+1
* merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe2008-11-231-12/+9
* git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-301-5/+13
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-2/+2
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-181-0/+379