Mercurial
Mercurial
>
hg
/ graph
summary
|
shortlog
|
changelog
| graph |
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
less
more
|
(0)
-10000
-3000
-1000
-300
-100
-12
+12
+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.mergestate: perform all premerges before any merges (BC)
2015-10-11, by Siddharth Agarwal
merge: introduce a preresolve function
2015-10-11, by Siddharth Agarwal
merge.mergestate._resolve: also return completed status
2015-10-11, by Siddharth Agarwal
merge.mergestate: add a wrapper around resolve
2015-10-11, by Siddharth Agarwal
simplemerge: move conflict warning message to filemerge
2015-10-09, by Siddharth Agarwal
filemerge: clean up some dead code
2015-10-11, by Siddharth Agarwal
run-tests: add b-prefix on two strings to fix python3 support
2015-10-12, by Augie Fackler
filemerge: break overall filemerge into separate premerge and merge steps
2015-10-11, by Siddharth Agarwal
filemerge: only copy to backup during premerge step
2015-10-11, by Siddharth Agarwal
filemerge: only print out "merging f" output at premerge step
2015-10-11, by Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block
2015-10-08, by Siddharth Agarwal
filemerge: introduce a premerge flag and function
2015-10-11, by Siddharth Agarwal
less
more
|
(0)
-10000
-3000
-1000
-300
-100
-12
+12
+100
+300
+1000
+3000
+10000
tip