Merge branch 'da/mergetool-delete-delete-conflict'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"