Mercurial > evolve
view .hgignore @ 5857:b0b1ab64f6d8
public-content-divergence: early set the public one to local side
This change helps us to:
1. remove some check-ups which we had to perform later at the time of
merging the two (to make sure that public one is at local side).
2. make the status msgs consistent:
```
Merge:[public_rev] desc_1
with: [other_rev] desc_2
```
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Mon, 08 Mar 2021 17:45:57 +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/