Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
builder-next: disable mergeop and diffop
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com> (cherry picked from commit 0ac3bf8) Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
- Loading branch information