Merge branch 'nd/rebase-forget'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"