view contrib/win32/mercurial.ico @ 48548:88a45330b290

simplemerge: rewrite `merge_lines()` using `merge_groups()` Simple is better. Differential Revision: https://phab.mercurial-scm.org/D11967
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 05 Jan 2022 11:34:54 -0800
parents 25ac72ca68f6
children
line wrap: on
line source

(binary:image/vnd.microsoft.icon)