Merge branch 'ah/show-ref-usage-string'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"