summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
AgeCommit message (Expand)AuthorFilesLines
2005-11-11octopus: do not do AND'ed merge base.Libravatar Junio C Hamano1-5/+20
2005-09-10Multi-backend merge driver.Libravatar Junio C Hamano1-0/+86