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

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

filemerge: add support for the new "mergediff" marker style to premerge...
filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606
Mathias De Mare - - Load All Authors

File last commit:

r46547:eccbfa7e default
r46755:3ca5ca38 default
Show More
centos8
18 lines | 321 B | text/plain | TextLexer
/ contrib / packaging / docker / centos8
History | Annotation | Raw |Copy content |Copy permalink
FROM centos:centos8
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