##// END OF EJS Templates
rebase: in --confirm option just abort if hit a conflict...
rebase: in --confirm option just abort if hit a conflict Before this patch, it was prompting the user in both cases 1) when there is no conflict 2) when there is at least one conflict. But for simplicity we can just abort if we hit a conflict and no need to prompt in that case. Differential Revision: https://phab.mercurial-scm.org/D3944

File last commit:

r38475:11eda1f1 default
r38701:b3d0c97a @81 default
Show More
fedora21
15 lines | 263 B | text/plain | TextLexer
FROM fedora:21
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN yum install -y \
gcc \
gettext \
make \
python-devel \
python-docutils \
rpm-build
# For creating repo meta data
RUN yum install -y createrepo