Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 5449:17a4b20eda7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
chunkiter: handle large reads more efficiently - for large reads, don't attempt to read more than necessary - if we've gathered the exact number of bytes needed, avoid a string copy
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 00:46:52 -0500
parents 93a4e72b4f83
children
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"
hg merge 1
hg id
cat a
hg status