From: mdw <mdw>
Date: Thu, 15 May 2003 23:32:02 +0000 (+0000)
Subject: Clarify conventions.
X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/commitdiff_plain/f13d5013f6ca3c4d839e668ff60127e332d29cb0

Clarify conventions.
---

diff --git a/BRANCHES b/BRANCHES
index 323b464..2f32e82 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
+	No merges