Mercurial > evolve
view .hgignore @ 5588:5cbb1f356137
unstable-list: add split and fold in content-divergence resolution
This patch adds the current status of divergence resolution when one of
the divergent changeset is a part of split or fold.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 10 Oct 2020 22:44:24 +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/