summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
AgeCommit message (Expand)AuthorFilesLines
2007-08-30Fixing comment in merge strategiesLibravatar Tom Clarke1-1/+1
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-5/+5
2005-09-10Use Daniel's read-tree in the merge strategy 'resolve'.Libravatar Junio C Hamano1-0/+80