Mercurial > hg
diff mercurial/wireproto.py @ 26615:c9223a3979b7
merge.mergestate: add a wrapper around resolve
The resolve function will be broken up into separate pre-resolve and resolve
steps.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sun, 11 Oct 2015 18:29:50 -0700 |
parents | 56b2bcea2529 |
children | 3e7f675628ad |