mergetools / gvimdiff3on commit Merge branch 'js/remote-rename-with-half-configured-remote' (fe575f0)
   1. "$MERGE_TOOLS_DIR/vimdiff"