aboutsummaryrefslogtreecommitdiffstats
path: root/merge.h
Commit message (Expand)AuthorAgeFilesLines
* Set the svn:eol-style property on all text files to "native", so thatGuy Harris2004-07-181-1/+1
* avoid using tmpnam() for security reasons.Ulf Lamping2004-06-291-3/+3
* if more than one file is (drag and) dropped into the program,Ulf Lamping2004-06-211-5/+5
* Fix compile errors on Suse 9.1:Jörg Mayer2004-06-181-3/+3
* merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping2004-06-181-0/+163