use difftool rather than ext-diff
restore only-this-window behavior for cursorline
merge from tomorrownight upstream
from http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool
add a mergetool
merge origin
review-branch
Merge branch 'work' of github.com:bukzor/dotfiles into work