tree 78f3ce3b05cf4371d7fb0a9e78dcf90c3e17f1d2
parent 5d1ab6d7f3e8f928c896232d2fb0ff95b3563ca6
parent aa56da853574fa6128b06cf53f5b6bdbc16d4534
author Anthony Sottile <asottile@umich.edu> 1650891698 -0400
committer GitHub <noreply@github.com> 1650891698 -0400
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJiZpuyCRBK7hj4Ov3rIwAAaXgIAD5Z5Wlu8BtBWe+Q1dHOT+I1
 xVDmd2B6Sc98V8P2fW8UXkgRmKbQI2IM5M9e4oKUSVqo5+nRhlBvCgL/d3cY3Qv2
 jupSNd8ZSyqcSCwcX8VuUeUAVMv3QABrkoWJUpN6Wts3k5+qjgU2rGm/lGnct13u
 BhJuVFGwHK+BQzHmjDEwSfMtT/ESWXsKVpaVqGWZBXjCdOSFHVRp6+WwSoHMMf0E
 8iFUa4NeThrDtt+v0WXCFMoVznMAUacA75blzanwDp3RlB/LXF0J/BCHIo5rlOLe
 lrGac5oAyzveGUwQMo8sbOmiyQ2I1D10OkEI+fykJKFGpKIywcSp9bVTjXGgS20=
 =QMFP
 -----END PGP SIGNATURE-----
 

Merge pull request #759 from bagerard/bagerard-patch-check-merge-conflict-doc

Document check-merge-conflict argument