adding some git utils
some tweaks to test is vimdiff does anything