Merge branch 'pw/doc-synopsis-markup-opmode-options'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:38 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:39 +0000 (15:25 -0700)
Docfix.

* pw/doc-synopsis-markup-opmode-options:
  show --continue/skip etc. consistently in synopsis

1  2 
Documentation/git-merge.txt
Documentation/git-rebase.txt

Simple merge
Simple merge