Merge branch 'sg/name-rev-wo-recursion'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"