Merge branch 'nd/list-merge-strategy'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"