mergetools / vimdiff3on commit Merge branch 'tb/unicode-6.3-zero-width' (334d40e)
   1. "$MERGE_TOOLS_DIR/vimdiff"