X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/6d56743beed37f62273209341fa812bcd6aa220f..025c5f4aa5ffbf8948482a4233318db81c2df5d2:/BRANCHES

diff --git a/BRANCHES b/BRANCHES
index 323b464..1cd9f21 100644
--- a/BRANCHES
+++ b/BRANCHES
@@ -1 +1,8 @@
+General conventions:
+
+For a branch FOO, we have:
+	FOO:root	point at which FOO leaves trunk or parent branch
+	FOO:merge-N	Nth branch merge point
+
 `ec' -- elliptic curve work
+	ec:merge-1	Closed.