view tests/test-context.py.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents 20af6a2f0b0e
children bd23d5f28bbb
line wrap: on
line source

workingfilectx.date = (1000, 0)