test-merge3
11 lines
| 165 B
| text/plain
|
TextLexer
/ tests / test-merge3
Thomas Arendsen Hein
|
r800 | #!/bin/sh | ||
mpm@selenic.com
|
r402 | |||
hg init | ||||
echo This is file a1 > a | ||||
hg add a | ||||
Thomas Arendsen Hein
|
r1933 | hg commit -m "commit #0" -d "1000000 0" | ||
mpm@selenic.com
|
r402 | touch b | ||
hg add b | ||||
rm b | ||||
Thomas Arendsen Hein
|
r1933 | hg commit -A -m"comment #1" -d "1000000 0" | ||
Matt Mackall
|
r11177 | exit 0 | ||