aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
Commit message (Expand)AuthorAge
* Merge branch 'db/checkout'Junio C Hamano2008-02-27
* Library function to check for unmerged index entriesDaniel Barkalow2008-02-09
* Build-in merge-recursiveDaniel Barkalow2008-02-09