Recording future merge instructions from 1.6 -> trunk.

git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4121 8db76d5a-ed1c-0410-87a9-c151d255dfc7

branch-info.txt

diff --git a/branch-info.txt b/branch-info.txt
index 705b937..8d8a4c5 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -10,7 +10,13 @@
 /releases/1.5/@r3630:3863 was merged (r3864) into this branch
 /releases/1.6/@r3739:3876 was merged (r3877) into trunk
 /releases/1.6/@r3878:3944 was merged (r3945) into trunk, skipping c3878
-/releases/1.6/@r3944:4025 was merged (r????) into trunk
+/releases/1.6/@r3944:4025 was merged (r4032) into trunk
 /branches/1_6_clean_events@3936:4088 was merged (r4092) into this branch
 
----> The next merge into trunk will be 4025:HEAD
+---> The next merge into trunk will be 4025:HEAD; however there will be great conflict between trunk:c4118 and this branch's c4120.  Highly suggested that the next merge to trunk "roll-back" c4118 in trunk before merging in 1.6.
+
+In trunk:
+  svn merge -c-4118 https://google-web-toolkit.googlecode.com/svn/trunk .
+  svn merge -r4025:???? https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
+  
+<---