mergetools / vimdiff3on commit Merge branch 'da/t7800-cleanup' (dd19bca)
   1. "$MERGE_TOOLS_DIR/vimdiff"