| commit | d64dd5de6cf6385d77dcd6014f1ce48369cf9ade | [log] [tgz] |
|---|---|---|
| author | James Moger <james.moger@gmail.com> | Fri Oct 28 16:04:40 2016 -0400 |
| committer | GitHub <noreply@github.com> | Fri Oct 28 16:04:40 2016 -0400 |
| tree | d104751eb03d4cacce2560d4f6684836dd692379 | |
| parent | bac124176649617171a0d4be4b0a4edcfa073776 [diff] | |
| parent | 355cbb8f10527032e9c9cedbef5b68f118418d68 [diff] |
Merge pull request #1142 from fzs/merge-strategy Merge strategy