mergetools / gvimdiff2on commit Merge branch 'ky/imap-send' (886c76d)
   1. "$MERGE_TOOLS_DIR/vimdiff"