Commit 7154f6ce0618e7d8582cd42d577f01cbc3c18d16

Stefan Sperling 2019-03-27T09:22:15

make 'got status' detect and indicate merge conflict markers