summaryrefslogtreecommitdiffstats
path: root/merge-recursive.h (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-051-0/+4
* merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-051-0/+1
* merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-041-0/+1
* merge-recursive: introduce merge_optionsMiklos Vajna2008-08-311-13/+29
* merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-311-1/+3
* Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-311-1/+5
* Build-in merge-recursiveDaniel Barkalow2008-02-101-0/+20