Make git get proper version for lint steps.
Add some tests for merging for lint steps.
Adjust lint-steps for using git.
Strip trailing newline from lint revision.
Switch lint steps to git.
Merge 'git-merge-lint': Extract git commit of most recent trunk commit, after merging.