Merge branch 'jc/diff-tree-stale-comment' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"