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

[coliveira (Carlos Nihelton)]

coliveira updated this revision to Diff 2480.
coliveira added a comment.


  Hi guys!
  
  Thanks for your feedback and patience. I had been running a lot these days...
  Please look into this diff and tell me what you think about it.
  
  Rgds,
  Carlos

REPOSITORY
  rKDEVPLATFORM KDevPlatform

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

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, arrowdodger