summaryrefslogtreecommitdiff
path: root/merge-file.c
AgeCommit message (Expand)Author
2012-12-10Which merge_file() function do you mean?Junio C Hamano
2011-04-11sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano
2010-05-02git diff too slow for a fileRené Scharfe
2010-03-21merge_file(): add comment explaining behavior wrt conflict styleJonathan Nieder
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-01-17merge-tree: use ll_merge() not xdl_merge()Junio C Hamano
2010-01-17xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano
2008-10-25Always initialize xpparam_t to 0Brian Downing
2007-12-14xdl_diff: identify call sites.Junio C Hamano
2007-07-06Future-proof source for changes in xdemitconf_tJohannes Schindelin
2007-02-27convert object type handling from a string to a numberNicolas Pitre
2006-12-13Get rid of the dependency on RCS' merge programJohannes Schindelin
2006-09-02Replace uses of strdup with xstrdup.Shawn Pearce
2006-06-29Improved three-way blob merging codeLinus Torvalds