Merge branch 'sb/unpack-trees-cleanup'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"