mergetools / gvimdiff2on commit Merge branch 'fc/send-email-annotate' (288aa75)
   1. "$MERGE_TOOLS_DIR/vimdiff"