##// END OF EJS Templates
partial-merge: add support for `.args` config (`$local` etc.)...
partial-merge: add support for `.args` config (`$local` etc.) It will be useful to be able to define custom command-line arguments per partial merge tool just like we have for regular merge tools. In particular, I expect the same binary to handle multiple languages, so it will be useful to be able to pass some argument indicating the language, or perhaps simply an argument defining a regex that's used for finding lines to merge as a sorted set. Differential Revision: https://phab.mercurial-scm.org/D12383

File last commit:

r21874:8da01b6e default
r49839:9dfbea54 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