mergetools / gvimdiff3on commit Merge branch 'tg/use-git-contacts' (bedb10c)
   1. "$MERGE_TOOLS_DIR/vimdiff"