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

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

merge: consider the file merged when using :merge-{local,other}...
merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See 6217040b2780 and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999
Mathias De Mare - - Load All Authors

File last commit:

r48266:25d36300 stable
r49415:50de0890 default
Show More
centos7
20 lines | 361 B | text/plain | TextLexer
/ contrib / packaging / docker / centos7
History | Annotation | Raw |Copy content |Copy permalink
FROM centos:centos7
RUN groupadd -g %GID% build && \
useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
RUN yum install -y epel-release
RUN yum install -y \
gcc \
gettext \
make \
python3-devel \
python36-docutils \
rpm-build \
tar
# For creating repo meta data
RUN yum install -y createrepo
# For rust extensions
RUN yum install -y cargo