Mercurial
Mercurial
>
hg-stable
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
help
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-2
+2
+10
+30
+100
+300
+1000
+3000
+10000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Fri, 20 Nov 2015 16:37:39 -0800
merge.applyupdates: use counters from mergestate
changeset
Siddharth Agarwal <sid0@fb.com> [Fri, 20 Nov 2015 16:37:39 -0800] rev 27078
merge.applyupdates: use counters from mergestate This eliminates a whole bunch of duplicate code and allows us to update the removed count for change/delete conflicts where the delete action was chosen.
Fri, 20 Nov 2015 16:18:51 -0800
mergestate: add a function to return the number of unresolved files
changeset
Siddharth Agarwal <sid0@fb.com> [Fri, 20 Nov 2015 16:18:51 -0800] rev 27077
mergestate: add a function to return the number of unresolved files Note that unlike the other functions, this is based on the persistent mergestate.
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-2
+2
+10
+30
+100
+300
+1000
+3000
+10000
tip