Merge branch 'jk/rebase-i-squash-count-fix'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"