tree df51db9d23fd7b646e4624d982aa8c0160af9de8
parent 9bf684c131befc87304489719223db5fb29f9ac7
author Vinay Karanam <vinayinvicible@gmail.com> 1530036244 +0530
committer Vinay Karanam <vinayinvicible@gmail.com> 1530037780 +0530

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

Fixes #300