magit-log-popup: resolve conflicting key bindings

See #1597.