Mercurial > hg
comparison tests/test-simple-update.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 | 8d72e29ad1e0 |
children | 2f2682f40ea0 |
comparison
equal
deleted
inserted
replaced
48547:374bf34c9ffd | 48548:88a45330b290 |
---|