tests/test-context.py.out
author Pierre-Yves David <pierre-yves.david@fb.com>
Wed, 14 May 2014 10:37:25 -0700
changeset 21578 7cfe51661e98
parent 14379 bd23d5f28bbb
child 21836 232038a05fdb
permissions -rw-r--r--
revert: explicitly get status against the parent This makes absolutely no functional changes. The default value for node1 is already the same as the current value of parent. But to be able to properly use the second parent in merge context, we have to start to be a bit more explicit about what we compute the status against.

workingfilectx.date = (1000, 0)
ASCII   : Gr?ezi!
Latin-1 : Grüezi!
UTF-8   : Grüezi!