diff mercurial/util.py @ 9557:dbe2bdd5e488

merge with i18n-stable
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Tue, 08 Sep 2009 19:46:20 -0300
parents b46063eabe98 7116494c48ab
children eae98607b349
line wrap: on
line diff
--- a/mercurial/util.py	Tue Aug 18 08:49:41 2009 +0200
+++ b/mercurial/util.py	Tue Sep 08 19:46:20 2009 -0300
@@ -84,7 +84,7 @@
     '%b %d %Y',
     '%b %d',
     '%H:%M:%S',
-    '%I:%M:%SP',
+    '%I:%M:%S%p',
     '%H:%M',
     '%I:%M%p',
 )