Merge branch 'jk/pull-rebase-using-fork-point'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"