Mercurial
Mercurial
>
hg
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-3
+3
+10
+30
+100
+300
+1000
+3000
+10000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Wed, 18 Nov 2015 15:40:28 -0800
filemerge: add support for change/delete conflicts to the ':local' merge tool
changeset
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Nov 2015 15:40:28 -0800] rev 27036
filemerge: add support for change/delete conflicts to the ':local' merge tool This covers two of the four cases of change/delete conflicts -- in an upcoming patch we'll make :other cover the other two.
Thu, 19 Nov 2015 10:50:02 -0800
merge.mergestate: compute dirstate action
changeset
Siddharth Agarwal <sid0@fb.com> [Thu, 19 Nov 2015 10:50:02 -0800] rev 27035
merge.mergestate: compute dirstate action In upcoming patches we're going to queue these actions up to be applied to the dirstate at the end.
Wed, 18 Nov 2015 14:22:52 -0800
filemerge: return whether the file was deleted
changeset
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Nov 2015 14:22:52 -0800] rev 27034
filemerge: return whether the file was deleted This is required for change/delete conflict resolution -- see previous patches for more details.
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-3
+3
+10
+30
+100
+300
+1000
+3000
+10000
tip