summaryrefslogtreecommitdiff
path: root/git-pull-script
AgeCommit message (Expand)Author
2005-04-18Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds