tests/test-conflict
author Eric Eisner <ede@mit.edu>
Mon, 26 Apr 2010 15:58:36 -0400
changeset 11047 c7dbd6c4877a
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
tags: return tags in sorted order This makes log and summary have less arbitrary tag ordering and also groups similar tags together, such as the mq tags.

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