summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
Commit message (Expand)AuthorAgeFilesLines
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-3/+3
* Assorted typo fixesPavel Roskin2007-02-031-1/+1
* read-tree --aggressiveJunio C Hamano2006-02-061-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-101-35/+3
* Multi-backend merge driver.Junio C Hamano2005-09-101-0/+80