[fileviewgitplugin] Ability to add conflicting files as well
Differential Revision: https://phabricator.kde.org/D17470
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>