Commit f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0

Stefan Sperling 2019-10-21T09:04:57

show base commit hash and omit filenames in conflict markers