2005-07-01 10:22:27 +04:00
|
|
|
#!/bin/sh
|
2005-06-15 12:27:20 +04:00
|
|
|
|
|
|
|
hg init
|
|
|
|
echo "nothing" > a
|
|
|
|
hg add a
|
2006-03-13 15:05:41 +03:00
|
|
|
hg commit -m ancestor -d "1000000 0"
|
2005-06-15 12:27:20 +04:00
|
|
|
echo "something" > a
|
2006-03-13 15:05:41 +03:00
|
|
|
hg commit -m branch1 -d "1000000 0"
|
2005-06-15 12:27:20 +04:00
|
|
|
hg co 0
|
|
|
|
echo "something else" > a
|
2006-03-13 15:05:41 +03:00
|
|
|
hg commit -m branch2 -d "1000000 0"
|
2005-07-29 18:19:43 +04:00
|
|
|
HGMERGE=merge; export HGMERGE
|
2006-05-15 08:07:34 +04:00
|
|
|
hg merge 1
|
2005-06-15 12:27:20 +04:00
|
|
|
hg id
|
2006-02-22 17:42:48 +03:00
|
|
|
egrep -v ">>>|<<<" a
|
2005-06-15 12:27:20 +04:00
|
|
|
hg status
|