Mercurial > evolve
diff tests/test-evolve-content-divergent-corner-cases.t @ 5766:82da27321e91 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 31 Jan 2021 16:15:26 +0800 |
| parents | 8d93e7fc0daa c2c85576ddfb |
| children | 0f32359bcf3e be8f7eb3f3a0 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-corner-cases.t Sun Jan 31 16:06:16 2021 +0800 +++ b/tests/test-evolve-content-divergent-corner-cases.t Sun Jan 31 16:15:26 2021 +0800 @@ -383,8 +383,7 @@ with: [6] updated e base: [4] added e rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a - file 'd' was deleted in local but was modified in other. - What do you want to do? + other changed d which local deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved working directory is now at 050a5d9ba60d