mergetools / gvimdiff3on commit Merge branch 'tg/git-remote' (ae2f255)
   1. "$MERGE_TOOLS_DIR/vimdiff"