diff tests/test-evolve-orphan-merge.t @ 6120:2662c6704ebd

evolve: compatibility for simplemerge.render_merge3()
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 19 Jan 2022 09:17:22 +0300
parents 1cbafebe874b
children c0921b5277a0 b1d1f4ade142
line wrap: on
line diff