##// END OF EJS Templates
mergestate: add a constructor that sets up a clean merge state...
mergestate: add a constructor that sets up a clean merge state Eventually, we'll move the read call out of the constructor. This will: - avoid unnecessary reads when we're going to nuke the merge state anyway - avoid raising an exception if there's an unsupported merge record 'clean' seems like a good name for it because I wanted to avoid anything with the word 'new' in it, and 'reset' is more an action performed on a merge state than a way to get a new merge state. Thanks to Martin von Zweigbergk for feedback about naming this.

File last commit:

r9999:f91e5630 default
r26987:416b2b7d default
Show More
hglogo.png
0 lines | 4.0 KiB | image/png | TextLexer
rendered-image