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