tree df51db9d23fd7b646e4624d982aa8c0160af9de8
parent 9bf684c131befc87304489719223db5fb29f9ac7
parent 64b9f3dcf0dcd16ec6011fc9111b3fd81e16fd80
author Anthony Sottile <asottile@umich.edu> 1530038136 -0700
committer GitHub <noreply@github.com> 1530038136 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJbMod4CRBK7hj4Ov3rIwAAdHIIAB9du0GM16Xm5IgD+5Z/07zV
 iFwjJ+amJVGJnL1XV8hPEa+nP8CIO1KSxHVfoMJJ/hZBe8CjVF6QnSShZkC9P2S1
 HoCS6z8mPhMzlSRPJjINb636MSc1BGtnQsbcIC38rryl2+Fsly/lL09YkxvIBDYg
 Dk7VHbL43ew8dcxTTp0RHcpSwKdfxKWdDaGYeMcBjfIXPYUhbqvhdENMxmAFp/Pa
 3b8Fcogpno+fB3fFyiZN4Yd5isDG2FtUAwkg/Db03chtgVQEtP3bctMhGKDYhgOz
 fqVCwQ4MKs9VWosCi/c5tilx8MTQUSCNBszzdqIgUfQZxh1S34GNjRERPw9YmqY=
 =fuo4
 -----END PGP SIGNATURE-----
 

Merge pull request #301 from vinayinvicible/force-merge

Added --assume-in-merge option for check-merge-conflict