X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/49a6af92db204536f6752583c1c24a34c1070c8c..09bd382dad1cd1e3d2f02bd5bc20040f0d2cc5c6:/doc/hooks diff --git a/doc/hooks b/doc/hooks index 30cd373..282ee86 100644 --- a/doc/hooks +++ b/doc/hooks @@ -15,11 +15,11 @@ Available hooks are: * pre-init * post-init * pre-merge - Use this hook to detect and handle merge conflicts before vcsh's native code + Use this hook to detect and handle merge conflicts before vcsh's native code finds and errors on them. This is useful for allowing clones on top of existing files. * post-merge - Use this hook to finish handling any merge conflicts found in the pre-merge hook. + Use this hook to finish handling any merge conflicts found in the pre-merge hook. * pre-pull * post-pull * pre-push