summaryrefslogtreecommitdiffstats
path: root/git-merge-resolve.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Convert to use quiet option when availableDan Loewenherz2009-04-231-2/+2
* Fixing comment in merge strategiesTom Clarke2007-08-311-1/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-031-3/+3
* Assorted typo fixesPavel Roskin2007-02-041-1/+1
* read-tree --aggressiveJunio C Hamano2006-02-071-1/+1
* [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-031-0/+6
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-111-35/+3
* Multi-backend merge driver.Junio C Hamano2005-09-111-0/+80