aboutsummaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
Commit message (Expand)AuthorAge
* Retire 'stupid' merge strategyMiklos Vajna2008-07-05
* Fixing comment in merge strategiesTom Clarke2007-08-30
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-10