Mercurial > hg
log mercurial/merge.py @ 26617:dfd9811c5c9b
age | author | description |
---|---|---|
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 |
Sun, 11 Oct 2015 20:47:14 -0700 | Siddharth Agarwal | filemerge: break overall filemerge into separate premerge and merge steps |
Sun, 11 Oct 2015 12:56:21 -0700 | Siddharth Agarwal | filemerge: also return whether the merge is complete |
Thu, 08 Oct 2015 12:55:45 -0700 | Pierre-Yves David | error: get Abort from 'error' instead of 'util' |
Mon, 28 Sep 2015 22:11:23 -0700 | Pierre-Yves David | merge: get the default update destination from the function |