view contrib/docker/centos5 @ 22841:18b3869179f9

merge: make error message consistent with other commands If a merge is attempted when another merge is already ongoing, we give the message "outstanding uncommitted merges". Many other commands (such as backout, rebase, histedit) give the same message in singular form. Since the singular form also seems to make more sense, let's use that for 'hg merge' as well.
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 08 Oct 2014 14:16:53 -0700
parents 49ea49823769
children eea2e0f76a24
line wrap: on
line source

FROM saltstack/centos-5-minimal
RUN yum install -y gcc make rpm-build gettext tar
RUN yum install -y python-devel python-docutils
# For creating repo meta data
RUN yum install -y createrepo
RUN yum install -y readline-devel openssl-devel ncurses-devel zlib-devel bzip2-devel