[git plugin] Add merge action

Authored by anthonyfieroni on Feb 9 2018, 8:56 PM.

Description

[git plugin] Add merge action

Differential Revision: https://phabricator.kde.org/D10213

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>

Details

Committed
anthonyfieroniFeb 9 2018, 8:56 PM
Differential Revision
D10213: [fileviewgitplugin] Add merge option
Parents
R449:92ea669a154b: [git plugin] Add log action
Branches
Unknown
Tags
Unknown
References
tag: v18.04.0, tag: v18.03.90, tag: v18.03.80