Merge branch 'mw/doc-merge-enumfix'

Fix old merge glitch in Documentation during v2.13-rc0 era. * mw/doc-merge-enumfix: doc: update the order of the syntax `git merge --continue`

Junio C Hamano committed Jun 18, 2018 at 10:18 UTC 23fc55a90c0956908cb595789b460179c062153b

No changes.