mergetools / vimdiff2on commit Merge branch 'tr/fd-gotcha-fixes' (de5412b)
   1. "$MERGE_TOOLS_DIR/vimdiff"