ignore merge commits
fix Blame() on Win32
fix window focus
use fugitive