summaryrefslogtreecommitdiffstats
path: root/git-merge-stupid.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixing comment in merge strategiesTom Clarke2007-08-311-1/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-031-5/+5
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-111-0/+80