aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.c
Commit message (Expand)AuthorAge
* merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe2008-11-23
* git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-30
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-18