Mergetool for git with vim and .rej files