Index: branches/stef3/cursusplanning2.txt
===================================================================
diff -u -r136 -r137
--- branches/stef3/cursusplanning2.txt	(.../cursusplanning2.txt)	(revision 136)
+++ branches/stef3/cursusplanning2.txt	(.../cursusplanning2.txt)	(revision 137)
@@ -5,4 +5,8 @@
 Maken van een branch
 .	in de repository (Copy to ...)
 .	Lokaal (Branch/tag ...)
-
+Merge branches back into trunk (merge revisions)
+.	(Merge trunk changes int branch)
+.	Merge branch changes into trunk
+Merge changes between two revisions (merge trees)
+Merge changes into other tree (Show log, Merge revision to ...)