summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
AgeCommit message (Expand)Author
2005-09-11Multi-backend merge driver.Junio C Hamano