summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
AgeCommit message (Expand)Author
2005-11-29define die() for scripts that use it.Junio C Hamano
2005-11-11octopus: do not do AND'ed merge base.Junio C Hamano
2005-09-11Multi-backend merge driver.Junio C Hamano