Commit 678ade17323ba52d28ca9b2b58dfe8a232958363

Stefan Sperling 2020-03-22T15:44:34

don't error out if rebase sees no merged paths; elide the commit instead