tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Tue, 11 Mar 2008 17:42:41 -0500
changeset 6229 c3182eeb70ea
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
dates: improve timezone handling datestr: - add format specifiers %1 and %2 for timezone hours and minutes - remove timezone and timezone format options - correctly find timezone hours and minutes for fractional and negative timezones - update users strdate: - correctly find timezone hours and minutes for fractional and negative timezones

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status