Merge branch 'sg/complete-decorate-full-not-long'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"