view tests/test-conflict @ 1317:008d3666bf41

Print commit time/date from perspective of committer.
Previously, it was printed in the time zone of the reader, but with
the committer's time zone offset.  It is now consistent.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status