aboutsummaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
Commit message (Expand)AuthorAge
* Multi-backend merge driver.Junio C Hamano2005-09-10