Mercurial > hg
log mercurial/merge.py @ 27087:98fc58378a3f
age | author | description |
---|---|---|
Sun, 15 Nov 2015 21:55:46 -0800 | Siddharth Agarwal | merge.recordupdates: don't require action keys to be present in dict |
Fri, 20 Nov 2015 11:26:31 -0800 | Siddharth Agarwal | merge.applyupdates: extend action queues with ones returned from mergestate |
Fri, 20 Nov 2015 16:43:25 -0800 | Siddharth Agarwal | mergestate: add a method to compute actions to perform on dirstate |
Fri, 20 Nov 2015 16:37:39 -0800 | Siddharth Agarwal | merge.applyupdates: use counters from mergestate |
Fri, 20 Nov 2015 16:18:51 -0800 | Siddharth Agarwal | mergestate: add a function to return the number of unresolved files |
Fri, 20 Nov 2015 16:17:54 -0800 | Siddharth Agarwal | mergestate: add a method to return updated/merged/removed counts |
Fri, 20 Nov 2015 16:32:47 -0800 | Siddharth Agarwal | mergestate._resolve: don't return the action any more |