summaryrefslogtreecommitdiffstats
path: root/contrib/examples/git-resolve.sh
AgeCommit message (Expand)AuthorLines
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano-17/+17
2007-02-12Remove git-resolve.Junio C Hamano-0/+112