mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
274bce0c1c
This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
16 lines
244 B
Bash
Executable File
16 lines
244 B
Bash
Executable File
#!/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
|