summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
Commit message (Expand)AuthorAgeFilesLines
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-101-35/+3
* Multi-backend merge driver.Junio C Hamano2005-09-101-0/+80