Mercurial > evolve

diff tests/test-evolve-content-divergence.t @ 3799:037ccbf41c6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: make sure we don't result in commit messages conflict Upcoming patches will introduce functionality of merging commit messages while resolving content divergence which can lead to conflicts. We don't want to test the conflicts scenario here, so let's make sure there are no conflicts of commit messages in this test.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 05 Jun 2018 22:02:24 +0530
parents 5b9e3aaa6da8
children ee78135b2f45
line wrap: on
line diff