fix the subtree-merge script
Merge pull request #30 from esc/maint/fix_subtree_merge

fix the subtree-merge script