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

Родитель 88df0fa659 2e9957525e

Коммит f72fd31063

1 изменённых файлов: 2 добавлений и 2 удалений