rach/rach.github.com — pull request #9 by bmcorser (2013-08-07 23:23:02+00:00)
Title: Add `theirs` option to merge strategy

Because `subtree` is really `recursive` under the hood, we can use options from that strategy.