tests/test-conflict
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 22 Sep 2005 21:15:57 -0700
changeset 1317 008d3666bf41
parent 814 0902ffece4b4
child 1925 c71420b186b0
permissions -rwxr-xr-x
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