summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000000..25a79663f2
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,6 @@
+Updating code base
+------------------
+
+This code is currently maintained using svnmerge.
+
+Changes from the trunk should only be merged using svnmerge as this allows better change tracking. \ No newline at end of file