##// END OF EJS Templates
simplemerge: make merge_lines() a free function...
simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974

File last commit:

r43676:e66a3bfc stable
r49406:c6649c53 default
Show More
fedora.template
15 lines | 275 B | text/plain | TextLexer
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