aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
Commit message (Expand)AuthorAge
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-02
* Improved three-way blob merging codeLinus Torvalds2006-06-28