Mercurial > hg
comparison tests/test-strip.t @ 44344:ab632e27f296
tests: add `hg log -G` output when there are merge conflicts
The next commit will change the behavior for these. I've used slightly
different commands in the different tests to match the surrounding
style.
Differential Revision: https://phab.mercurial-scm.org/D8042
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 29 Jan 2020 14:42:54 -0800 |
| parents | 90d8a2a42d5c |
| children | 14d0e89520a2 |
comparison
equal
deleted
inserted
replaced
| 44343:8561ad49915d | 44344:ab632e27f296 |
|---|---|
| 589 commit: 1 modified, 1 unknown, 1 unresolved | 589 commit: 1 modified, 1 unknown, 1 unresolved |
| 590 update: (current) | 590 update: (current) |
| 591 phases: 2 draft | 591 phases: 2 draft |
| 592 mq: 3 unapplied | 592 mq: 3 unapplied |
| 593 | 593 |
| 594 $ hg log --graph | |
| 595 @ changeset: 1:76dcf9fab855 | |
| 596 | tag: tip | |
| 597 | user: test | |
| 598 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 599 | summary: b | |
| 600 | | |
| 601 o changeset: 0:9ab35a2d17cb | |
| 602 user: test | |
| 603 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 604 summary: a | |
| 605 | |
| 594 $ echo c > b | 606 $ echo c > b |
| 595 $ hg strip tip | 607 $ hg strip tip |
| 596 abort: uncommitted changes | 608 abort: uncommitted changes |
| 597 [255] | 609 [255] |
| 598 $ hg strip tip --keep | 610 $ hg strip tip --keep |