Allow specifying --no-commit as an option.
Add support for -s and -X when merging.
Merge pull request #69 from ktf/pass-options

Pass options to underlying merge command