test-merge4
17 lines
| 335 B
| text/plain
|
TextLexer
/ tests / test-merge4
Thomas Arendsen Hein
|
r800 | #!/bin/sh | ||
mpm@selenic.com
|
r416 | |||
| 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
|
r416 | echo This is file b1 > b | ||
| hg add b | ||||
|
Thomas Arendsen Hein
|
r1933 | hg commit -m "commit #1" -d "1000000 0" | ||
|
mpm@selenic.com
|
r416 | hg update 0 | ||
| echo This is file c1 > c | ||||
| hg add c | ||||
|
Thomas Arendsen Hein
|
r1933 | hg commit -m "commit #2" -d "1000000 0" | ||
Vadim Gelfer
|
r2283 | hg merge 1 | ||
|
mpm@selenic.com
|
r416 | rm b | ||
| echo This is file c22 > c | ||||
|
Thomas Arendsen Hein
|
r1933 | hg commit -m "commit #3" -d "1000000 0" | ||