Mercurial > evolve
comparison docs/figures/figure-ug05.svg @ 3799:037ccbf41c6d
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 | 8328337d23b2 |
| children | 091eab1223a4 |
comparison
equal
deleted
inserted
replaced
| 3798:7c05ee4a8cc7 | 3799:037ccbf41c6d |
|---|