Fixed bug in git plugin
Fixing git bugs
Fixed bug where side-by-side view wasn't working during merge