Commit Graph

1 Commits

Author SHA1 Message Date
Michael Armbrust
a49938903d Add Merge Script
Shamelessly copied from spark... still prompts for options that don't make sense (JIRA) but its better than messy merge trees :)

Author: Michael Armbrust <michael@databricks.com>

Closes #16 from marmbrus/mergeScript.
2015-09-09 20:03:52 -07:00