Mercurial > hg
diff tests/test-merge5.t @ 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 | 527ce85c2e60 |
children | 55c6ebd11cb9 |