##// END OF EJS Templates
simplemerge: convert `merge_lines()` away from generator...
simplemerge: convert `merge_lines()` away from generator We always consume all the lines and put them in a list anyway. By making the function not a generator, we can later make it return an additional value (to indicate if there were conflicts). Differential Revision: https://phab.mercurial-scm.org/D11973

File last commit:

r21874:8da01b6e default
r49405:ce8c82a5 default
Show More
provision.sh
10 lines | 292 B | application/x-sh | BashLexer
#!/bin/sh
# This scripts is used to install dependencies for
# testing Mercurial. Mainly used by Vagrant (see
# Vagrantfile for details).
export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install -y -q python-dev unzip
# run-tests.sh is added by Vagrantfile
chmod +x run-tests.sh