[Differential] [Request, 55 lines] D932: Cannot find the 'MERGE' option into KDevPlatform VCS support source code

[coliveira (Carlos Nihelton)]

coliveira created this revision.
coliveira added reviewers: apol, mwolff.
coliveira set the repository for this revision to rKDEVPLATFORM KDevPlatform.
coliveira added a project: KDevelop.
Herald added a subscriber: kdevelop-devel.

REVISION SUMMARY
  As we talked before, it was added some code to include 'MERGE' capability for git plugin.

REPOSITORY
  rKDEVPLATFORM KDevPlatform

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

AFFECTED FILES
  plugins/git/gitplugin.cpp
  plugins/git/gitplugin.h
  plugins/openwith/kdevopenwith.json
  vcs/dvcs/ui/branchmanager.cpp
  vcs/dvcs/ui/branchmanager.h
  vcs/dvcs/ui/branchmanager.ui
  vcs/interfaces/ibranchingversioncontrol.h

EMAIL PREFERENCES
  https://phabricator.kde.org/settings/panel/emailpreferences/

To: coliveira, apol, mwolff
Cc: kdevelop-devel, arrowdodger