mergetools / gvimdiff3on commit Merge branch 'kd/mailinfo-quoted-string' (fe252ef)
   1. "$MERGE_TOOLS_DIR/vimdiff"