mergetools / vimdiff3on commit Merge branch 'bp/add-diff-files-optim' (9235a6c)
   1. "$MERGE_TOOLS_DIR/vimdiff"