diff tests/test-stack-branch.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 c4097632a1a3
children 79bc0f1a832e 5c8196a550b6 ca9753176053
line wrap: on
line diff