summaryrefslogtreecommitdiff
path: root/merge-file.c
AgeCommit message (Expand)Author
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