summaryrefslogtreecommitdiff
path: root/merge-file.c
AgeCommit message (Expand)AuthorFilesLines
2006-09-02Replace uses of strdup with xstrdup.Libravatar Shawn Pearce1-1/+1
2006-06-28Improved three-way blob merging codeLibravatar Linus Torvalds1-0/+166