test-merge2.out
25 lines
| 475 B
| text/plain
|
TextLexer
/ tests / test-merge2.out
mpm@selenic.com
|
r409 | + hg init | ||
| + hg add a | ||||
Thomas Arendsen Hein
|
r801 | + hg commit -m commit #0 -d 0 0 | ||
|
mpm@selenic.com
|
r409 | + hg add b | ||
|
Thomas Arendsen Hein
|
r801 | + hg commit -m commit #1 -d 0 0 | ||
|
mpm@selenic.com
|
r409 | + hg update 0 | ||
| + hg add b | ||||
|
Thomas Arendsen Hein
|
r801 | + hg commit -m commit #2 -d 0 0 | ||
|
mpm@selenic.com
|
r409 | + hg init | ||
| + hg add a | ||||
|
Thomas Arendsen Hein
|
r801 | + hg commit -m commit #0 -d 0 0 | ||
|
mpm@selenic.com
|
r409 | + hg add b | ||
|
Thomas Arendsen Hein
|
r801 | + hg commit -m commit #1 -d 0 0 | ||
|
mpm@selenic.com
|
r409 | + hg update 0 | ||
|
Thomas Arendsen Hein
|
r801 | + hg commit -A -m commit #2 -d 0 0 | ||
Bryan O'Sullivan
|
r767 | adding b | ||
|
mpm@selenic.com
|
r409 | + hg init | ||
| + hg add a | ||||
|
Thomas Arendsen Hein
|
r801 | + hg commit -m commit #0 -d 0 0 | ||
|
mpm@selenic.com
|
r409 | + hg add b | ||
|
Thomas Arendsen Hein
|
r801 | + hg commit -m commit #1 -d 0 0 | ||
|
mpm@selenic.com
|
r409 | + hg remove b | ||
| + hg update 0 | ||||
|
Thomas Arendsen Hein
|
r801 | + hg commit -A -m commit #2 -d 0 0 | ||
|
Bryan O'Sullivan
|
r767 | adding b | ||