Mercurial
Mercurial
>
hg
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
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
.
Sun, 11 Oct 2015 12:56:21 -0700
filemerge: also return whether the merge is complete
changeset
Siddharth Agarwal <sid0@fb.com> [Sun, 11 Oct 2015 12:56:21 -0700] rev 26606
filemerge: also return whether the merge is complete In future patches, we'll pause merges after the premerge step. After the premerge step we'll return complete = False.
Sun, 11 Oct 2015 12:31:08 -0700
filemerge: add a wrapper around the filemerge function
changeset
Siddharth Agarwal <sid0@fb.com> [Sun, 11 Oct 2015 12:31:08 -0700] rev 26605
filemerge: add a wrapper around the filemerge function We'll introduce a separate premerge function that calls the same code.
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-2
+2
+10
+30
+100
+300
+1000
+3000
+10000
tip