[fileviewgitplugin] Ability to add conflicting files as well

Authored by anthonyfieroni on Dec 11 2018, 6:55 AM.