Mercurial > evolve
diff tests/test-wireproto.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 | b8cb1bdbc8d7 |
children | 42dbe3a38ac2 62b60fc1983d |