git fetch origin branch
git diff --name-only HEAD..origin/branch
git diff HEAD..origin/branch directory_foo/file_bar.ext
git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt fals
git mergetool
:diffg RE " get from REMOTE
:diffg BA " get from BASE
:diffg LO " get from LOCAL
git checkout --theirs path/to/file