summaryrefslogtreecommitdiff
path: root/merge-file.c
Commit message (Expand)AuthorAgeFilesLines
* convert object type handling from a string to a numberNicolas Pitre2007-02-271-5/+5
* Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-121-62/+13
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-021-1/+1
* Improved three-way blob merging codeLinus Torvalds2006-06-281-0/+166