Merge branch 'ag/rebase-p'

The help message shown in the editor to edit todo list in "rebase -p"
has regressed recently, which has been corrected.

* ag/rebase-p:
  git-rebase--preserve-merges: fix formatting of todo help message
This commit is contained in:
Junio C Hamano 2018-07-24 14:50:44 -07:00
commit f72fd31063