##// 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
Mads Kiilerich - - Load All Authors

File last commit:

r43676:e66a3bfc stable
r46755:3ca5ca38 default
Show More
fedora.template
15 lines | 275 B | text/plain | TextLexer
/ contrib / packaging / docker / fedora.template
History | Source | Raw |Copy content |Copy permalink
Mads Kiilerich
packaging: make dockerrpm fedora target more generic...
 r43676 FROM fedora:%OS_RELEASE%
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN dnf install -y \
gcc \
gettext \
make \
python3-devel \
python3-docutils \
rpm-build
# For creating repo meta data
RUN dnf install -y createrepo