Mercurial > evolve

comparison tests/test-evolve-content-divergent-corner-cases.t @ 6121:0804f51208d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add merge labels CORE-TEST-OUTPUT-UPDATE: a809f1465a76
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 01 Feb 2022 18:12:37 +0300
parents a1dad44fe3da
children 548cddc1ae7a 53d63b608230
comparison
equal deleted inserted replaced
6120:2662c6704ebd 6121:0804f51208d6
373 > EOF 373 > EOF
374 merge:[5] updated e 374 merge:[5] updated e
375 with: [6] updated e 375 with: [6] updated e
376 base: [4] added e 376 base: [4] added e
377 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a 377 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a
378 file 'd' was deleted in local but was modified in other. 378 file 'd' was deleted in local [local] but was modified in other [other].
379 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. 379 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
380 What do you want to do? c 380 What do you want to do? c
381 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 381 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
382 working directory is now at 050a5d9ba60d 382 working directory is now at 050a5d9ba60d
383 383