summaryrefslogtreecommitdiff
path: root/merge-file.c
AgeCommit message (Expand)AuthorFilesLines
2010-03-20merge_file(): add comment explaining behavior wrt conflict styleLibravatar Jonathan Nieder1-0/+6
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-1/+1
2010-01-16merge-tree: use ll_merge() not xdl_merge()Libravatar Junio C Hamano1-9/+7
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersLibravatar Junio C Hamano1-3/+3
2008-10-25Always initialize xpparam_t to 0Libravatar Brian Downing1-0/+1
2007-12-13xdl_diff: identify call sites.Libravatar Junio C Hamano1-1/+1
2007-07-06Future-proof source for changes in xdemitconf_tLibravatar Johannes Schindelin1-0/+1
2007-02-27convert object type handling from a string to a numberLibravatar Nicolas Pitre1-5/+5
2006-12-12Get rid of the dependency on RCS' merge programLibravatar Johannes Schindelin1-62/+13
2006-09-02Replace uses of strdup with xstrdup.Libravatar Shawn Pearce1-1/+1
2006-06-28Improved three-way blob merging codeLibravatar Linus Torvalds1-0/+166