Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 1591:5a3229cf1492

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not copy atime and mtime in util.copyfiles it is unsupported on some fs (vfat) and we don't need to copy it one clone anyway
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 16 Dec 2005 01:32:44 -0600
parents 0902ffece4b4
children c71420b186b0
line wrap: on
line source

#!/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