test-merge4.out
15 lines
| 318 B
| text/plain
|
TextLexer
/ tests / test-merge4.out
mpm@selenic.com
|
r416 | + hg init | ||
| + echo This is file a1 | ||||
| + hg add a | ||||
|
mpm@selenic.com
|
r749 | + hg commit -m 'commit #0' -d '0 0' | ||
|
mpm@selenic.com
|
r416 | + echo This is file b1 | ||
| + hg add b | ||||
|
mpm@selenic.com
|
r749 | + hg commit -m 'commit #1' -d '0 0' | ||
|
mpm@selenic.com
|
r416 | + hg update 0 | ||
| + echo This is file c1 | ||||
| + hg add c | ||||
|
mpm@selenic.com
|
r749 | + hg commit -m 'commit #2' -d '0 0' | ||
|
mpm@selenic.com
|
r416 | + hg update -m 1 | ||
| + rm b | ||||
| + echo This is file c22 | ||||
|
mpm@selenic.com
|
r749 | + hg commit -m 'commit #3' -d '0 0' | ||