[git-j] Support passing -m when switching branches.

git-j now accepts the -m parameter when switching branches. This will be
passed to the 'git checkout' command. This is used to attempt a merge,
instead of completely failing if there are conflicts.