Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-B5.t @ 4676:b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
And it's worth making the suggestion an actual hint.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 06 Jun 2019 17:37:42 +0800 |
| parents | ab3581bc0637 |
| children | f555039d1a08 62b60fc1983d |
comparison
equal
deleted
inserted
replaced
| 4669:daab6d665687 | 4676:b6c819facbe8 |
|---|