Merge branch 'ks/rfc2047-one-char-at-a-time'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"