summaryrefslogtreecommitdiff
path: root/.merge-branch-exclude
AgeCommit message (Expand)Author
2009-10-20updated merge exclusion file.slioch
2009-10-16Should handle all of the merge issues.slioch