aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
Commit message (Expand)AuthorAge
* Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-06
* convert object type handling from a string to a numberNicolas Pitre2007-02-27
* Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-12
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-02
* Improved three-way blob merging codeLinus Torvalds2006-06-28