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

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

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
Gregory Szorc - - Load All Authors

File last commit:

r38477:c8ef9d89 default
r49406:c6649c53 default
Show More
debian.template
16 lines | 298 B | text/plain | TextLexer
/ contrib / packaging / docker / debian.template
History | Annotation | Raw |Copy content |Copy permalink
FROM debian:%CODENAME%
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN apt-get update && apt-get install -y \
build-essential \
debhelper \
devscripts \
dh-python \
less \
python \
python-all-dev \
python-docutils \
unzip \
zip