##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r46582:97142451 default
r49410:69e76b2a default
Show More
ubuntu.template
21 lines | 365 B | text/plain | TextLexer
Gregory Szorc
packaging: don't write files for templatized Dockerfiles...
r38477 FROM ubuntu:%CODENAME%
Gregory Szorc
packaging: consistently create build user in Dockerfiles...
r38475
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
Matt Harbison
packaging: drop Disco (19.04) and add Focal (20.04)...
r46582 ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=%TZ%
Gregory Szorc
packaging: move most of contrib/docker to contrib/packaging/docker...
r38023 RUN apt-get update && apt-get install -y \
build-essential \
debhelper \
devscripts \
dh-python \
less \
python \
Connor Sheehan
packaging: update Ubuntu docker build dependencies to Python 3...
r44488 python3-all \
python3-all-dev \
python3-docutils \
Gregory Szorc
packaging: move most of contrib/docker to contrib/packaging/docker...
r38023 unzip \
zip