aboutsummaryrefslogtreecommitdiffstats
path: root/merge.h
AgeCommit message (Expand)AuthorFilesLines
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
2004-06-29avoid using tmpnam() for security reasons.Ulf Lamping1-3/+3
2004-06-21if more than one file is (drag and) dropped into the program,Ulf Lamping1-5/+5
2004-06-18Fix compile errors on Suse 9.1:Jörg Mayer1-3/+3
2004-06-18merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping1-0/+163