##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r43815:e182deb5 default
r49393:e8f1414c default
Show More
Vagrantfile
13 lines | 415 B | text/x-ruby | RubyLexer
# -*- mode: ruby -*-
Vagrant.configure('2') do |config|
# Debian 10.1 x86_64 without configuration management software
config.vm.box = "debian/buster64"
config.vm.hostname = "tests"
config.vm.define "tests" do |conf|
conf.vm.provision :file, source: "run-tests.sh", destination:"run-tests.sh"
conf.vm.provision :shell, path: "provision.sh"
conf.vm.synced_folder "../..", "/hgshared"
end
end