Merge branch 'nd/checkout-m-doc-update'

Doc about the above. * nd/checkout-m-doc-update: checkout.txt: note about losing staged changes with --merge

Junio C Hamano committed Apr 16, 2019 at 19:28 UTC 3feaacbaa15f6437a1767935a5ff04fdef0e86e3

No changes.