Merge branch 'gh/jump-auto-mode'

The 'git-jump' command (in contrib/) has been taught to automatically pick a mode (merge, diff, or ws) when invoked without arguments. * gh/jump-auto-mode: git-jump: pick a mode automatically when invoked without arguments