Pass --no-edit to git merge
Merge branch 'master' into capgrids