dhuang/compass — pull request #1 by dhuang (2013-12-16 06:41:42+00:00)
Title: default to use merge, fixes issue #2

I think it's safe to have --merge by default to avoid the conflict errors. Added to tests to cover the feature branch to feature branch case.