view .hg-format-source @ 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
```

{"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"}