##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: demonstrate how conflict markers end up $local *and* $output...
tests: demonstrate how conflict markers end up $local *and* $output When a merge tool is configured to keep conflict markers, they are supposed to be written to `$local` if `$output` is not mentioned in the tool's `merge-tools.<tool>.args` config, and in `$output` if it is mentioned. However, I broke the latter case in D12190. Differential Revision: https://phab.mercurial-scm.org/D12378
Martin von Zweigbergk - - Load All Authors

File last commit:

r49625:6cfa3068 merge default
r49822:b10a944c stable
Show More
rhel8
18 lines | 330 B | text/plain | TextLexer
/ contrib / packaging / docker / rhel8
History | Annotation | Raw |Copy content |Copy permalink
FROM rockylinux/rockylinux:8
RUN groupadd -g %GID% build && \
useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
RUN yum install -y \
gcc \
gettext \
make \
python3-devel \
python3-docutils \
rpm-build
# For creating repo meta data
RUN yum install -y createrepo
# For rust extensions
RUN yum install -y cargo