D10213: [fileviewgitplugin] Add merge option

[Anthony Fieroni]

anthonyfieroni updated this revision to Diff 26442.

REPOSITORY
  R449 Plugins for Dolphin

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D10213?vs=26283&id=26442

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

AFFECTED FILES
  git/fileviewgitplugin.cpp
  git/fileviewgitplugin.h

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/61c79a25/attachment.htm>