Merge branch 'rr/format-patch-count-without-merges'

* rr/format-patch-count-without-merges: format-patch: Don't go over merge commits t4014-format-patch: Call test_tick before committing