From: Luke Lau <luke_lau@icloud.com>
Date: Thu, 1 Aug 2019 15:35:05 +0000 (+0100)
Subject: Add clash constraints when merging
X-Git-Url: http://git.lukelau.me/?a=commitdiff_plain;h=e678abfda96412fdb71b8256963d99ebd4cecaf8;hp=e678abfda96412fdb71b8256963d99ebd4cecaf8;p=scheme.git

Add clash constraints when merging
---