diff hgweb.cgi @ 26987:416b2b7d3068

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.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 17:00:54 -0800
parents 4b0fc75f9403
children 47ef023d0165
line wrap: on
line diff