rebase: implement --merge via the interactive machinery
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"