From: KES Date: Wed, 28 Dec 2016 13:09:38 GMT Subject: git mergetool Segmentation fault Message-ID: <950881482930578@web15j.yandex.ru> I suppose this is some bug. Because `Segmentation fault` is not expected in any case http://stackoverflow.com/questions/41362676/how-to-resolve-merge-conflict-while-rebasing