Sun, 31 Dec 2017 14:42:54 -0500
add conflict marker highlight
--converge --extended-syntax --indent-columns=2 --continuation-indentation=2 --maximum-line-length=100 --no-outdent-long-quotes --no-blanks-before-comments --maximum-consecutive-blank-lines=2 --opening-token-right --all-containers-tightness=2 --block-brace-tightness=1 --indent-spaced-block-comments --closing-side-comments --closing-side-comment-interval=100 --stack-closing-hash-brace --stack-closing-square-bracket