aboutsummaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
Commit message (Expand)AuthorAge
* Convert to use quiet option when availableDan Loewenherz2009-04-22
* Fixing comment in merge strategiesTom Clarke2007-08-30
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* Assorted typo fixesPavel Roskin2007-02-03
* read-tree --aggressiveJunio C Hamano2006-02-06
* [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-03
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-10
* Multi-backend merge driver.Junio C Hamano2005-09-10