Commit 6891a862bbde86f9262c4b367effb1e29d7c513b

Edward Thomson 2014-01-19T18:12:22

Load merge.conflictstyle setting from config