mergetools / vimdiff3on commit Merge branch 'rs/mailinfo-lib' (4a78871)
   1. "$MERGE_TOOLS_DIR/vimdiff"