mergetools / gvimdiff3on commit Merge branch 'km/imap-send-libcurl-options' (0a81977)
   1. "$MERGE_TOOLS_DIR/vimdiff"