smart_merge: do not assign `log` in case of GitCommandError

In case of error `why` is used for the `log` argument to `abort`.
It might get changed to also pass on the output from `git merge --abort`
via `log` or something similar though?!