summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'db/checkout'Junio C Hamano2008-02-271-5/+8
* Library function to check for unmerged index entriesDaniel Barkalow2008-02-091-13/+2
* Build-in merge-recursiveDaniel Barkalow2008-02-091-0/+1762