summaryrefslogtreecommitdiffstats
path: root/merge-file.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Improved three-way blob merging codeLinus Torvalds2006-06-291-0/+166