##// END OF EJS Templates
merge default into stable for 3.1 code freeze
merge default into stable for 3.1 code freeze

File last commit:

r21837:61b333b9 default
r21926:6c36dc6c merge 3.1-rc stable
Show More
test-context.py.out
13 lines | 192 B | text/plain | TextLexer
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