summaryrefslogtreecommitdiff
path: root/catlfish-dev/merge.sh
Commit message (Expand)AuthorAgeFilesLines
* Pass $MERGE_EXTRA_ARGS.Linus Nordberg2015-06-121-1/+2
* Node name is second arg, not third.Linus Nordberg2015-06-121-2/+2
* Initial commit.Linus Nordberg2015-05-261-0/+32