Merge branch 'js/rebase-autostash-fix'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"