Merge branch 'ss/howto-manage-trunk'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"