From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jun 2018 17:18:45 +0000 (-0700)
Subject: Merge branch 'mw/doc-merge-enumfix'
X-Git-Tag: v2.18.0~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/23fc55a90c0956908cb595789b460179c062153b?hp=--cc

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`
---

23fc55a90c0956908cb595789b460179c062153b