aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
Commit message (Expand)AuthorAge
* Improved three-way blob merging codeLinus Torvalds2006-06-28