Update with the steps for merging in R4_HEAD
diff --git a/scripts/merge_e4_into_ui.txt b/scripts/merge_e4_into_ui.txt
index 8127a41..e4a1f03 100644
--- a/scripts/merge_e4_into_ui.txt
+++ b/scripts/merge_e4_into_ui.txt
@@ -26,6 +26,15 @@
# if you haven't then you have a lot of pushing to do:
git push --force
+# merge org.eclipse.ui/R4_HEAD into the 4.2 master
+# did it using EGit and the http://wiki.eclipse.org/EGit/User_Guide#Resolving_a_merge_conflict
+# Merge tool
+ Conflicts:
+ bundles/org.eclipse.ui/META-INF/MANIFEST.MF
+ bundles/org.eclipse.ui/schema/viewActions.exsd
++ I had to fix PDE prefs for at least 2 projects
+
+
cd eclipse.platform.ui
for f in $( cat ../common_tags.txt ) ; do git tag ${f}_R3 ${f}; git tag -d $f ; git push origin :$f ; done
