summaryrefslogtreecommitdiff
path: root/catlfish-dev/merge.sh
Commit message (Expand)AuthorAgeFilesLines
* Follow move of catlfish source.Linus Nordberg2017-02-211-2/+2
* merge.py is gone, long live merge.Linus Nordberg2015-11-191-4/+4
* 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