view tests/test-status-inprocess.py.out @ 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 07dbafd3a0e2
children
line wrap: on
line source

% creating repo
% add and commit
C test.py
% change
M test.py