Mercurial > hg
view tests/test-conflict @ 7413:0b6428da1f22
email: add References field in the header
This hopefully helps clients get the threading right.
author | Benoit Allard <benoit@aeteurope.nl> |
---|---|
date | Tue, 25 Nov 2008 23:13:14 +0100 |
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