mergetools / gvimdiff2on commit Merge branch 'ee/clean-test-fixes' (83d9092)
   1. "$MERGE_TOOLS_DIR/vimdiff"