mergetools / gvimdiff3on commit Merge branch 'ti/external-sha1dc' (cb6ec86)
   1. "$MERGE_TOOLS_DIR/vimdiff"