summaryrefslogtreecommitdiff
BranchCommit messageAuthorAge
masterupdate pipeliner so that git pulls are merge-resolved with -Xtheirs rather th...Nick White7 weeks