D10213: [fileviewgitplugin] Add merge option

[Elvis Angelaccio]

elvisangelaccio added inline comments.

INLINE COMMENTS

> fileviewgitplugin.cpp:111
> +    m_mergeAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Merge..."));
> +    connect(m_mergeAction, SIGNAL(triggered()),
> +            this, SLOT(merge()));

Let's use the Qt5's `connect()` syntax for new code.

> fileviewgitplugin.cpp:426
> +
> +    KRun::runCommand(QLatin1String("git mergetool"), nullptr, m_contextDir);
> +}

`QStringLiteral`

REPOSITORY
  R449 Plugins for Dolphin

REVISION DETAIL
  https://phabricator.kde.org/D10213

To: anthonyfieroni, elvisangelaccio, emmanuelp, #dolphin
Cc: ngraham
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.kde.org/mailman/private/kfm-devel/attachments/20180203/d282b92e/attachment.htm>