##// 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
Matt Harbison - - Load All Authors

File last commit:

r46582:97142451 default
r46755:3ca5ca38 default
Show More
ubuntu.template
21 lines | 365 B | text/plain | TextLexer
/ contrib / packaging / docker / ubuntu.template
History | Source | Raw |Copy content |Copy permalink
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