Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"