aboutsummaryrefslogtreecommitdiffstats
path: root/git-prune-script (follow)
AgeCommit message (Expand)AuthorFilesLines
2005-04-18Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds1-0/+2