summaryrefslogtreecommitdiffstats
path: root/git-merge-stupid.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-111-0/+80