Mercurial
Mercurial
>
hg-stable
/ graph
summary
|
shortlog
|
changelog
| graph |
tags
|
bookmarks
|
branches
|
files
|
help
less
more
|
(0)
-10000
-3000
-1000
-300
-100
-15
+15
+100
+300
+1000
+3000
+10000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
The revision graph only works with JavaScript-enabled browsers.
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
2015-11-25, by Siddharth Agarwal
test-merge-changedelete.t: print out debugmergestate
2015-11-25, by Siddharth Agarwal
debugmergestate: also recognize change/delete conflicts in the merge state
2015-11-24, by Siddharth Agarwal
debugmergestate: print out null nodes as 'null'
2015-11-30, by Siddharth Agarwal
test-merge-force.t: check .orig files separately
2015-11-24, by Siddharth Agarwal
merge.recordupdates: mark 'a' files as added unconditionally
2015-11-24, by Siddharth Agarwal
merge: add a new action type representing files to add/mark as modified
2015-11-30, by Siddharth Agarwal
mergestate: add a cached property accessor for the local context
2015-11-30, by Siddharth Agarwal
mergestate: raise exception if otherctx is accessed but _other isn't set
2015-11-30, by Siddharth Agarwal
pager: improve help for --pager=
2015-11-30, by timeless
setup: remove unused py_modules argument to setup()
2015-11-24, by Gregory Szorc
test-merge-changedelete.t: add resolve --list output
2015-11-23, by Siddharth Agarwal
test-merge-changedelete.t: add a file with regular merge conflicts
2015-11-23, by Siddharth Agarwal
filemerge: in ':prompt', use ':fail' tool rather than returning directly
2015-11-24, by Siddharth Agarwal
filemerge: in ':fail' tool, write out other side if local side is deleted
2015-11-24, by Siddharth Agarwal
less
more
|
(0)
-10000
-3000
-1000
-300
-100
-15
+15
+100
+300
+1000
+3000
+10000
tip