Mercurial > hg-stable
log
age | author | description |
---|---|---|
Sun, 11 Oct 2015 21:56:39 -0700 | Siddharth Agarwal | merge.mergestate: perform all premerges before any merges (BC) |
Sun, 11 Oct 2015 20:12:12 -0700 | Siddharth Agarwal | merge: introduce a preresolve function |
Sun, 11 Oct 2015 18:37:54 -0700 | Siddharth Agarwal | merge.mergestate._resolve: also return completed status |
Sun, 11 Oct 2015 18:29:50 -0700 | Siddharth Agarwal | merge.mergestate: add a wrapper around resolve |