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

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

tests: demonstrate how conflict markers end up $local *and* $output...
tests: demonstrate how conflict markers end up $local *and* $output When a merge tool is configured to keep conflict markers, they are supposed to be written to `$local` if `$output` is not mentioned in the tool's `merge-tools.<tool>.args` config, and in `$output` if it is mentioned. However, I broke the latter case in D12190. Differential Revision: https://phab.mercurial-scm.org/D12378
Gregory Szorc - - Load All Authors

File last commit:

r38477:c8ef9d89 default
r49822:b10a944c stable
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