Merge branch 'nd/remote-plural-ours-plus-theirs'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"