view tests/test-context.py.out @ 23394:b5e2128ce9e6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Nov 2014 17:30:05 -0600
parents c95db3208a33
children a4958cdb2202
line wrap: on
line source

workingfilectx.date = (1000, 0)
ASCII   : Gr?ezi!
Latin-1 : Grüezi!
UTF-8   : Grüezi!
<status modified=['foo'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
diff --git a/foo b/foo

--- a/foo
+++ b/foo
@@ -1,1 +1,2 @@
 foo
+bar