summaryrefslogtreecommitdiffstats
path: root/git-merge-octopus.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Multi-backend merge driver.Junio C Hamano2005-09-111-0/+86