summaryrefslogtreecommitdiff
path: root/git-prune-script
Commit message (Expand)AuthorAgeFilesLines
* Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds2005-04-181-0/+2