tree d104751eb03d4cacce2560d4f6684836dd692379
parent bac124176649617171a0d4be4b0a4edcfa073776
parent 355cbb8f10527032e9c9cedbef5b68f118418d68
author James Moger <james.moger@gmail.com> 1477685080 -0400
committer GitHub <noreply@github.com> 1477685080 -0400

Merge pull request #1142 from fzs/merge-strategy

Merge strategy