Merge branch 'jk/warn-on-object-refname-ambiguity'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"