summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
AgeCommit message (Expand)Author
2007-08-31Fixing comment in merge strategiesTom Clarke
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-02-04Assorted typo fixesPavel Roskin
2006-02-07read-tree --aggressiveJunio C Hamano
2005-10-03[PATCH] Enable and fix support for base less merges.Fredrik Kuivinen
2005-09-11Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano
2005-09-11Multi-backend merge driver.Junio C Hamano