Mercurial > evolve
comparison tests/test-push-checkheads-superceed-A5.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 | 21f06d932231 |
children | 2280461343e5 62b60fc1983d |
comparison
equal
deleted
inserted
replaced
4669:daab6d665687 | 4676:b6c819facbe8 |
---|