Add some tests for merging for lint steps.
Adjust lint-steps for using git.
Switch lint steps to git.