Merge branch 'jk/merge-tree-added-identically'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"