summaryrefslogtreecommitdiff
path: root/merge-file.c
Commit message (Expand)AuthorAgeFilesLines
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-021-1/+1
* Improved three-way blob merging codeLinus Torvalds2006-06-281-0/+166