summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)Author
2008-07-22builtin-merge: add missing structure initializationPierre Habouzit
2008-07-22builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna
2008-07-20builtin-merge.c: Fix option parsingMichele Ballabio
2008-07-20Teach 'git merge' that some merge strategies no longer existMiklos Vajna
2008-07-16Merge branch 'mv/merge-in-c'Junio C Hamano
2008-07-10Teach merge.log to "git-merge" againJunio C Hamano
2008-07-08Build in mergeMiklos Vajna