summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
AgeCommit message (Expand)AuthorFilesLines
2006-12-02xmerge: make return value from xdl_merge() more usable.Libravatar Junio C Hamano1-10/+7
2006-12-02xdiff: add xdl_merge()Libravatar Johannes Schindelin1-0/+433