Index: tests/selftest.pl.in
===================================================================
RCS file: /cvs/gnome/intltool/tests/selftest.pl.in,v
retrieving revision 1.32
diff -u -r1.32 selftest.pl.in
--- tests/selftest.pl.in	13 Jun 2004 00:40:18 -0000	1.32
+++ tests/selftest.pl.in	14 Jun 2004 09:25:22 -0000
@@ -126,7 +126,7 @@
 
 print " 9. Merge translations into a dia sheet style XML file [broken XML]: ";
 $case = "merge5p.sheet";
-system("$INTLTOOL_MERGE -x -p --quiet cases cases/$case.in cases/$case") == 0 or $failed = 1;
+system("$INTLTOOL_MERGE -x -u -p --quiet cases cases/$case.in cases/$case") == 0 or $failed = 1;
 check_merge_result($case);
 
 print "10. Merge translations that include escaped .po strings:             ";
Index: tests/results/merge5p.sheet
===================================================================
RCS file: /cvs/gnome/intltool/tests/results/merge5p.sheet,v
retrieving revision 1.4
diff -u -r1.4 merge5p.sheet
--- tests/results/merge5p.sheet	11 Dec 2003 10:34:15 -0000	1.4
+++ tests/results/merge5p.sheet	14 Jun 2004 09:25:22 -0000
@@ -4,15 +4,15 @@
   <name xml:lang="az">BuLay</name>
   <name xml:lang="fr_FR">CetteFeuille</name>
   <description>This is a sheet for testing</description>
-  <description xml:lang="az">Bu lay s&#196;&#177;naq &#195;&#188;&#195;&#167;&#195;&#188;nd&#195;&#188;r</description>
+  <description xml:lang="az">Bu lay sınaq üçündür</description>
   <description xml:lang="fr_BE">Ceci est une feuille pour tester</description>
   <description xml:lang="fr_FR">Ceci est une feuille pour tester</description>
   <contents>
     <object name="Test - Mixer" intdata="0">
       <description>A cake mixer</description>
-      <description xml:lang="az">K&#195;&#182;k&#201;&#153; qar&#196;&#177;&#197;&#159;d&#196;&#177;r&#196;&#177;c&#196;&#177;</description>
-      <description xml:lang="fr_BE">Un m&#233;langeur &#224; p&#226;tisserie</description>
-      <description xml:lang="fr_FR">Un m&#195;&#169;langeur &#195;&#160; p&#195;&#162;tisserie</description>
+      <description xml:lang="az">Kökə qarışdırıcı</description>
+      <description xml:lang="fr_BE">Un mélangeur à pâtisserie</description>
+      <description xml:lang="fr_FR">Un mélangeur à pâtisserie</description>
     </object>
   </contents>
 </sheet>
