summaryrefslogtreecommitdiff
path: root/ll-merge.c
AgeCommit message (Expand)Author
2009-04-30replace direct calls to unlink(2) with unlink_or_warnAlex Riesen
2008-11-24merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe
2008-08-31git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin
2008-02-18merge-recursive: split low-level merge functions out.Junio C Hamano