aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/merge-faq.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/merge-faq.txt b/docs/merge-faq.txt
index c2f90e7f..65fce3c0 100644
--- a/docs/merge-faq.txt
+++ b/docs/merge-faq.txt
@@ -1,3 +1,6 @@
+Setuptools/Distribute Merge FAQ
+-------------------------------
+
Where does the merge occur?
========================================================