For 'conflict (add/add)' and 'conflict (modify/delete)' issues

Merge branch 'git-tag' of https://github.com/ashutoshdhundhara/vscode into ashutoshdhundhara-git-tag

GPG support 

Fix staging lines to not corrupt line endings when autocrlf is enabled

* Improved "Go To Bracket" to jump to next bracket.

* Removed extra bracket.

* Moved BracketMode class outside of test and removed comment from test string.

* Added multi-cursor support to "Go to Bracket"

* Fixed formatting.

* Changed line endings to LF.

* Fixed more line endings.

* Fixed "Go to Bracket" failing with a selection.

Removing tags that we can better get from FilePUT and FileGET - this will reduce the volume of telemetry and also reduce confusion.