test-merge1.out
45 lines
| 832 B
| text/plain
|
TextLexer
/ tests / test-merge1.out
|
r407 | + hg init | ||
+ hg add a | ||||
|
r801 | + hg commit -m commit #0 -d 0 0 | ||
|
r407 | + hg add b | ||
|
r801 | + hg commit -m commit #1 -d 0 0 | ||
|
r407 | + hg update 0 | ||
+ hg add c | ||||
|
r801 | + hg commit -m commit #2 -d 0 0 | ||
+ hg update -m 1 | ||||
|
r407 | + hg init | ||
+ hg add a | ||||
|
r801 | + hg commit -m commit #0 -d 0 0 | ||
|
r407 | + hg add b | ||
|
r801 | + hg commit -m commit #1 -d 0 0 | ||
|
r407 | + hg update 0 | ||
+ hg add c | ||||
|
r801 | + hg commit -m commit #2 -d 0 0 | ||
+ hg update -m 1 | ||||
|
r407 | merging for b | ||
merging b | ||||
+ hg init | ||||
+ hg add a | ||||
|
r801 | + hg commit -m commit #0 -d 0 0 | ||
|
r407 | + hg add b | ||
|
r801 | + hg commit -m commit #1 -d 0 0 | ||
+ hg commit -m commit #2 -d 0 0 | ||||
|
r407 | + hg update 1 | ||
+ hg add c | ||||
|
r801 | + hg commit -m commit #3 -d 0 0 | ||
|
r430 | This is file b1 | ||
|
r801 | + hg update -m 2 | ||
|
r430 | merging for b | ||
merging b | ||||
|
r407 | + hg init | ||
+ hg add a | ||||
|
r801 | + hg commit -m commit #0 -d 0 0 | ||
|
r407 | + hg add b | ||
|
r801 | + hg commit -m commit #1 -d 0 0 | ||
+ hg commit -m commit #2 -d 0 0 | ||||
|
r407 | + hg update 1 | ||
+ hg add c | ||||
|
r801 | + hg commit -m commit #3 -d 0 0 | ||
+ hg update -m 2 | ||||
|
r407 | merging for b | ||
merging b | ||||