Mercurial > hg
view tests/test-symlink-os-yes-fs-no.py.out @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
parents | 89630d0b3e23 |
children |
line wrap: on
line source
adding changesets adding manifests adding file changes added 1 changesets with 4 changes to 4 files new changesets d326ae2d01ee (1 drafts) 4 files updated, 0 files merged, 0 files removed, 0 files unresolved adding changesets adding manifests adding file changes added 1 changesets with 4 changes to 4 files new changesets d326ae2d01ee (1 drafts) 4 files updated, 0 files merged, 0 files removed, 0 files unresolved