Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 2137:5fefab118f7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix timezone check. According to http://en.wikipedia.org/wiki/List_of_time_zones timezones go from UTC-12 to UTC+14.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 26 Apr 2006 22:15:01 -0700
parents 7544700fd931
children e506c14382fd
line wrap: on
line source

#!/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"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
egrep -v ">>>|<<<" a
hg status