Commit 5a3ad9e051c99696dd2552a566a4fcea06a2f227

Stefan Sperling 2019-02-08T12:06:59

wrap overlong long line and fix NULL-deref in merge_diff3()