summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
AgeCommit message (Expand)Author
2007-08-31Fixing comment in merge strategiesTom Clarke
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2005-09-11Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano