From: Caleb Maclennan <caleb@alerque.com>
Date: Sun, 20 Oct 2013 01:11:52 +0000 (-0600)
Subject: add hooks to enable auto handing of merge conflicts
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/49a6af92db204536f6752583c1c24a34c1070c8c?ds=inline;hp=49a6af92db204536f6752583c1c24a34c1070c8c

add hooks to enable auto handing of merge conflicts

These hooks before and after the actual checkout process
will enable a pair of hook scripts to automatically handle
conflicts and potentially allow the checkout of repositories
over existing file sets
---