up and down arrows to go through command history
made vim-fugitive the default mergetool