summaryrefslogtreecommitdiff
path: root/merge-file.c
AgeCommit message (Expand)Author
2006-06-29Improved three-way blob merging codeLinus Torvalds