X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/f13d5013f6ca3c4d839e668ff60127e332d29cb0..578a86d91941a0f722b87973d88e84ec2cf9a608:/BRANCHES

diff --git a/BRANCHES b/BRANCHES
index 2f32e82..1cd9f21 100644
--- a/BRANCHES
+++ b/BRANCHES
@@ -1,8 +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
+	FOO:root	point at which FOO leaves trunk or parent branch
+	FOO:merge-N	Nth branch merge point
 
 `ec' -- elliptic curve work
-	No merges
+	ec:merge-1	Closed.