mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
20 lines
172 B
Bash
Executable File
20 lines
172 B
Bash
Executable File
#!/bin/sh
|
|
# a test for issue586
|
|
|
|
hg init a
|
|
cd a
|
|
echo a > a
|
|
hg ci -Ama
|
|
|
|
hg init ../b
|
|
cd ../b
|
|
echo b > b
|
|
hg ci -Amb
|
|
|
|
hg pull -f ../a
|
|
hg merge
|
|
hg rm -f a
|
|
hg ci -Amc
|
|
|
|
hg st -A
|