Merge branch 'jk/pretty-G-format-fixes'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"