mergetools / vimdiff3on commit Start preparing for 2.8.4 (b051c59)
   1. "$MERGE_TOOLS_DIR/vimdiff"