merge: fix misleading pre-merge check documentation
authorElijah Newren <newren@gmail.com>
Sun, 1 Jul 2018 01:25:03 +0000 (18:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 16:38:36 +0000 (09:38 -0700)
commit55f39cf...551bd468065306328efdb78933b36b69
tree7a7e686...d5447d82cceb84ad9ad860bddbf008a2copy hash to clipboard (tree)
parenteddd1a4...1d935420e1746108ecfee564114a129fcopy hash to clipboard (diff)
Documentation/git-merge.txt