Mercurial > evolve
view .hgignore @ 3761:777c29ac02bf
content-div: add test showing `--stop` works during interrupted resolution
This patch adds a test showing that the --stop flag of `hg evolve` works well
during interrupted content-divergence resolution.
The --stop flag now works with all the three different type of instability
resolution very well and we should advertise it more.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 22 May 2018 21:33:50 +0530 |
parents | aad37ffd7d58 |
children | ba316ce15040 |
line wrap: on
line source
syntax: re /figures/[^/]+\.png$ ^html/ \.pyc$ ~$ \.swp$ \.orig$ \.rej$ ^tests/.*\.err$ ^tests/easy_run.sh$ ^build/ ^dist/ ^MANIFEST$ ^docs/tutorials/.*\.rst$ \.ico$ tests/\.testtimes ^docs/training/graphs/ ^docs/training/html/ ^docs/training/index.html ^docs/training/graphviz-images/ ^docs/training/img/ ^docs/training/output/ ^docs/training/pandocfilters/