##// END OF EJS Templates
merge: do not delete untracked files silently (issue5962)...
merge: do not delete untracked files silently (issue5962) 37450a122128, 2a774cae3a03, and 656ac240f392 weren't enough to prevent data loss. No unknown "files" weren't deleted before 7a8a16f8ea22, "context: also consider path conflicts when clearing unknown files."

File last commit:

r26140:a31ffc44 default
r39232:8c6775e8 stable
Show More
Vagrantfile
13 lines | 414 B | text/x-ruby | RubyLexer
# -*- mode: ruby -*-
Vagrant.configure('2') do |config|
# Debian 8.1 x86_64 without configuration management software
config.vm.box = "debian/jessie64"
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