Merge branch 'hv/bitshift-constants-in-blame'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"