upstream/mercurial-mirror Files · contrib/vagrant

merge: add tests to show current behavior on failed filemerges...

merge: add tests to show current behavior on failed filemerges Currently, failed file merges will nevertheless force the user to continue attempting to merge all additional unresolved files. Future patches will allow the user to halt the merge process instead. This patch first introduces a test demonstrating the current bejhavior so the upcoming changes are more obvious. Differential Revision: https://phab.mercurial-scm.org/D930

Ryan McElroy -


            r34680:143337bc

default

Name	Size	Modified	Last Commit	Author
/ contrib / vagrant
README.md	Loading ...
Vagrantfile	Loading ...
provision.sh	Loading ...
run-tests.sh	Loading ...

contrib/vagrant/README.md

Run Mercurial tests with Vagrant:

$ vagrant up
$ vagrant ssh -c ./run-tests.sh

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages