aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/examples/git-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras1-1/+1
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano1-17/+17
2007-02-12Remove git-resolve.Junio C Hamano1-0/+112