Mercurial > hg
comparison tests/test-casecollision-merge.t @ 46071:f4f07cc92a47
tests: update the exit status codes for Windows specific tests
This corresponds to 527ce85c2e60, ebee234d952a, and 568c05d8f3d2.
Differential Revision: https://phab.mercurial-scm.org/D9538
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 07 Dec 2020 20:57:50 -0500 |
| parents | 8e472f3b7c63 |
| children | 7ce8b4d2bd55 |
comparison
equal
deleted
inserted
replaced
| 46070:8dfcebd084b6 | 46071:f4f07cc92a47 |
|---|---|
| 330 abort: case-folding collision between [bB] and [Bb] (re) | 330 abort: case-folding collision between [bB] and [Bb] (re) |
| 331 [255] | 331 [255] |
| 332 | 332 |
| 333 $ hg update --check | 333 $ hg update --check |
| 334 abort: uncommitted changes | 334 abort: uncommitted changes |
| 335 [255] | 335 [20] |
| 336 | 336 |
| 337 $ hg update --clean | 337 $ hg update --clean |
| 338 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 338 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 339 $ hg parents --template '{rev}\n' | 339 $ hg parents --template '{rev}\n' |
| 340 1 | 340 1 |