summaryrefslogtreecommitdiff
path: root/git-merge-resolve.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-3/+3
2007-02-03Assorted typo fixesLibravatar Pavel Roskin1-1/+1
2006-02-06read-tree --aggressiveLibravatar Junio C Hamano1-1/+1
2005-10-03[PATCH] Enable and fix support for base less merges.Libravatar Fredrik Kuivinen1-0/+6
2005-09-10Use Daniel's read-tree in the merge strategy 'resolve'.Libravatar Junio C Hamano1-35/+3
2005-09-10Multi-backend merge driver.Libravatar Junio C Hamano1-0/+80