[Differential] [Closed] D932: Cannot find the 'MERGE' option into KDevPlatform VCS support source code

[mwolff (Milian Wolff)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rKDEVPLATFORM18ac02556ddb: Add merge capability for git plugin. (authored by mwolff).

CHANGED PRIOR TO COMMIT
  https://phabricator.kde.org/D932?vs=2542&id=3975#toc

REPOSITORY
  rKDEVPLATFORM KDevPlatform

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D932?vs=2542&id=3975

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

AFFECTED FILES
  plugins/git/gitplugin.cpp
  plugins/git/gitplugin.h
  plugins/git/tests/test_git.cpp
  plugins/git/tests/test_git.h
  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, kfunk
Cc: kfunk, kdevelop-devel, Pilzschaf, akshaydeo, surgenight, joshiakshay, arrowdodger