svn commit: r13142 - trunk/contrib/client-side

Author: archiecobbs
Date: Thu Feb 24 09:19:36 2005
New Revision: 13142

Modified:
   trunk/contrib/client-side/svnmerge
Log:
* trunk/contrib/client-side/svnmerge:
  - A more correct version of the previous commit (r13141) using LC_MESSAGES
    suggested by Peter N. Lundblad 
<peter-6xcAyKHJV83ijAM5ABkZJQ@xxxxxxxxxxxxxxxx>.


Modified: trunk/contrib/client-side/svnmerge
Url: 
http://svn.collab.net/viewcvs/svn/trunk/contrib/client-side/svnmerge?view=diff&rev=13142&p1=trunk/contrib/client-side/svnmerge&r1=13141&p2=trunk/contrib/client-side/svnmerge&r2=13142
==============================================================================
--- trunk/contrib/client-side/svnmerge  (original)
+++ trunk/contrib/client-side/svnmerge  Thu Feb 24 09:19:36 2005
@@ -48,9 +48,9 @@
 SRCREV=`echo '$Rev$' | sed 's/^\$Rev: \([0-9]\{1,\}\).\{0,\}$/\1/g'`
 SRCDATE=`echo '$Date$' | sed 's/^\$Date: .\{0,\}(\(.\{0,\}\)).\{0,\}$/\1/g'`
 
-# We expect English output
-unset LANG
-unset LC_ALL
+# We expect non-localized output
+LC_MESSAGES="C"
+export LC_MESSAGES
 
 # Subroutine to output usage message
 usage()