summaryrefslogtreecommitdiff
path: root/git-merge.sh
Commit message (Expand)AuthorAgeFilesLines
...
* Multi-backend merge driver.Junio C Hamano2005-09-101-0/+212