diff tests/test-push-checkheads-pruned-B6.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 196ed65594dc
children 8d20c0af010a fc60328270ac
line wrap: on
line diff