user avatar
Added --assume-in-merge option for check-merge-conflict
Vinay Karanam authored
Fixes #300
64b9f3dc
Name Last commit Last update