Diff - 63e729fcc7d7fa21db65e1a62f1e53140f594aaf^2..63e729fcc7d7fa21db65e1a62f1e53140f594aaf - pre-commit-hooks - Git at Google

commit: 63e729fcc7d7fa21db65e1a62f1e53140f594aaf
[log] [tgz]
author: Anthony Sottile <asottile@umich.edu>
Tue Jun 26 11:35:36 2018 -0700
committer: GitHub <noreply@github.com>
Tue Jun 26 11:35:36 2018 -0700
tree: df51db9d23fd7b646e4624d982aa8c0160af9de8
parent: 9bf684c131befc87304489719223db5fb29f9ac7 [diff]
parent: 64b9f3dcf0dcd16ec6011fc9111b3fd81e16fd80 [diff]

Merge pull request #301 from vinayinvicible/force-merge

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