X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/6927829eb87b6abbe8b9cdee346624c73aecb512..0d43d6fb9186a776c55f51e00fcf557e2e5f7c57:/doc/hooks?ds=sidebyside

diff --git a/doc/hooks b/doc/hooks
index 54ff795..282ee86 100644
--- a/doc/hooks
+++ b/doc/hooks
@@ -14,6 +14,12 @@ Available hooks are:
 * post-enter
 * pre-init
 * post-init
+* pre-merge
+	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.
 * pre-pull
 * post-pull
 * pre-push