summaryrefslogtreecommitdiff
path: root/merge-file.c
AgeCommit message (Expand)Author
2006-09-02Replace uses of strdup with xstrdup.Shawn Pearce
2006-06-29Improved three-way blob merging codeLinus Torvalds