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