mergetools / gvimdiff2on commit Merge branch 'ks/rfc2047-one-char-at-a-time' (573f1a9)
   1. "$MERGE_TOOLS_DIR/vimdiff"