Mercurial > evolve
comparison tests/test-evolve-interrupted.t @ 5542:7a184d29fff5
tests: graphlog now only shows '%' if there are unresolved conflicts
CORE-TEST-OUTPUT-UPDATE: 85b03b1e4715
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 17 Sep 2020 19:51:08 +0800 |
| parents | a799f5d228f1 |
| children | ae4dbbf2b929 16ab2cc74b4b ad80552c706c |
comparison
equal
deleted
inserted
replaced
| 5541:98e2613d797d | 5542:7a184d29fff5 |
|---|---|
| 50 abort: precommit hook exited with status 1 | 50 abort: precommit hook exited with status 1 |
| 51 [255] | 51 [255] |
| 52 $ hg l | 52 $ hg l |
| 53 @ 2 apricot and blueberry | 53 @ 2 apricot and blueberry |
| 54 | 54 |
| 55 % 1 banana | 55 * 1 banana |
| 56 | | 56 | |
| 57 x 0 apricot | 57 x 0 apricot |
| 58 | 58 |
| 59 $ cat b | 59 $ cat b |
| 60 banana | 60 banana |
| 78 banana | 78 banana |
| 79 | 79 |
| 80 $ hg l | 80 $ hg l |
| 81 @ 2 apricot and blueberry | 81 @ 2 apricot and blueberry |
| 82 | 82 |
| 83 % 1 banana | 83 * 1 banana |
| 84 | | 84 | |
| 85 x 0 apricot | 85 x 0 apricot |
| 86 | 86 |
| 87 | 87 |
| 88 Test various methods of handling that unfinished state | 88 Test various methods of handling that unfinished state |