Commit 11495e04177c42cbbbab8416171bad777b37e5d0

Stefan Sperling 2019-07-12T20:12:06

tweak 'got rebase' conflict error message