Add vimfu doc on keeping one version or the other upon merge conflict.
plugin update fugitive.