From: Richard Hartmann <RichiH@users.noreply.github.com>
Date: Sat, 8 Feb 2014 15:30:38 +0000 (+0100)
Subject: Merge pull request #89 from alerque/master
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/30e3b0e741f20d73e24978b4722dd58e7b3ef741

Merge pull request #89 from alerque/master

Add hooks to allow fancy merge handling
---

30e3b0e741f20d73e24978b4722dd58e7b3ef741