tests/test-context.py.out
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 13 Nov 2014 23:12:15 -0800
changeset 23319 3177d710630d
parent 22914 c95db3208a33
child 23700 a4958cdb2202
permissions -rw-r--r--
merge: drop underscore prefix from _checkunknown() The method has been called from commands.py since 3eab42088be4 (update: just merge unknown file collisions, 2012-02-09), so drop the underscore prefix that suggests that it's private.

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