Merge branch 'cb/avoid-colliding-with-netbsd-hmac'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"