summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2005-09-10Use Daniel's read-tree in the merge strategy 'resolve'.Libravatar Junio C Hamano1-35/+3
2005-09-10Multi-backend merge driver.Libravatar Junio C Hamano1-0/+80