mergetools / gvimdiffon commit Merge branch 'sb/clean-test-fix' (c5d782b)
   1. "$MERGE_TOOLS_DIR/vimdiff"