summaryrefslogtreecommitdiff
path: root/src/xdiff/xmerge.c
Commit message (Expand)AuthorAgeFilesLines
* Fix warnings on 64-bit windows buildsRussell Belfer2012-04-171-3/+3
* Import xdiff library from gitRussell Belfer2012-03-021-0/+619