esnme/locust — comment on commit ea7fa623140b96e37f626a1bf9de9a4b030e6de9
File:  line 0
By heyman:

Cool, I think it's better to leave the default conflict commit message, where you see which files were conflicted.