view tests/test-context.py.out @ 22578:939ce500c92a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 29 Sep 2014 17:23:38 -0500
parents 61b333b982ea
children c95db3208a33
line wrap: on
line source

workingfilectx.date = (1000, 0)
ASCII   : Gr?ezi!
Latin-1 : Grüezi!
UTF-8   : Grüezi!
(['foo'], [], [], [], [], [], [])
diff --git a/foo b/foo

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