tests/test-context.py.out
author Matt Mackall <mpm@selenic.com>
Sat, 05 Mar 2011 16:34:59 -0600
changeset 13536 fac040b7e822
parent 4110 20af6a2f0b0e
child 14379 bd23d5f28bbb
permissions -rw-r--r--
merge: drop resolve state for mergers with identical contents (issue2680)

workingfilectx.date = (1000, 0)