summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
AgeCommit message (Expand)Author
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-02-12Remove git-resolve.Junio C Hamano