Merge branch 'cc/interpret-trailers-more'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"