Mercurial > evolve
comparison tests/test-rewind.t @ 5314:e6e92835d42d mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 08 May 2020 20:36:29 +0800 |
parents | e5fe3ca5e6ad e8660b28bfee |
children | eed42a183d46 |
comparison
equal
deleted
inserted
replaced
5313:e8542915d0f7 | 5314:e6e92835d42d |
---|---|
501 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 501 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
502 adding C | 502 adding C |
503 adding D | 503 adding D |
504 diff --git a/C b/C | 504 diff --git a/C b/C |
505 new file mode 100644 | 505 new file mode 100644 |
506 examine changes to 'C'? | 506 examine changes to 'C'? [Ynesfdaq?] y |
507 (enter ? for help) [Ynesfdaq?] y | |
508 | 507 |
509 @@ -0,0 +1,1 @@ | 508 @@ -0,0 +1,1 @@ |
510 +C | 509 +C |
511 record change 1/2 to 'C'? | 510 record change 1/2 to 'C'? [Ynesfdaq?] f |
512 (enter ? for help) [Ynesfdaq?] f | |
513 | 511 |
514 diff --git a/D b/D | 512 diff --git a/D b/D |
515 new file mode 100644 | 513 new file mode 100644 |
516 examine changes to 'D'? | 514 examine changes to 'D'? [Ynesfdaq?] d |
517 (enter ? for help) [Ynesfdaq?] d | |
518 | 515 |
519 created new head | 516 created new head |
520 continue splitting? [Ycdq?] c | 517 continue splitting? [Ycdq?] c |
521 $ hg log -G | 518 $ hg log -G |
522 @ changeset: 5:9576e80d6851 | 519 @ changeset: 5:9576e80d6851 |