Command to Compare File Against a Different Branch
git difftool staging -- app/FdaDrug.php.phpIn this example:
stagingis the branch name--separates branch name from the file to diffapp\FdaDrug.phpis the file to diff
How to Set Vimdiff as Git's Diff Tool
git config --global diff.tool vimdiff