summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
Commit message (Expand)AuthorAgeFilesLines
* Retire 'stupid' merge strategyMiklos Vajna2008-07-051-80/+0
* Fixing comment in merge strategiesTom Clarke2007-08-301-1/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-5/+5
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-101-0/+80