Commit f363d6636651617411c1b973f63133cf224199c2

Stefan Sperling 2019-05-23T10:25:19

add a test for 'got commit' with a conflicted file