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
|
2005-07-22 00:05:17 +04:00
|
|
|
hg commit -m ancestor -d "0 0"
|
2005-06-15 12:27:20 +04:00
|
|
|
echo "something" > a
|
2005-07-22 00:05:17 +04:00
|
|
|
hg commit -m branch1 -d "0 0"
|
2005-06-15 12:27:20 +04:00
|
|
|
hg co 0
|
|
|
|
echo "something else" > a
|
2005-07-22 00:05:17 +04:00
|
|
|
hg commit -m branch2 -d "0 0"
|
2005-07-29 18:19:43 +04:00
|
|
|
HGMERGE=merge; export HGMERGE
|
2005-07-03 10:54:35 +04:00
|
|
|
hg up -m 1
|
2005-06-15 12:27:20 +04:00
|
|
|
hg id
|
2005-06-17 20:50:55 +04:00
|
|
|
grep -Ev ">>>|<<<" a
|
2005-06-15 12:27:20 +04:00
|
|
|
hg status
|