aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.h
Commit message (Expand)AuthorAge
* merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-29
* merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-04
* merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-04
* merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-03
* merge-recursive: introduce merge_optionsMiklos Vajna2008-08-30
* merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-30
* Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-30
* Build-in merge-recursiveDaniel Barkalow2008-02-09