Mercurial
Mercurial
>
hg
/ graph
summary
|
shortlog
|
changelog
| graph |
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
less
more
|
(0)
-30000
-10000
-3000
-1000
-300
-100
-50
-32
+32
+50
+100
+300
+1000
+3000
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.
filemerge: pass `simplemerge.MergeInput` to tool functions
2022-01-20, by Martin von Zweigbergk
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
2022-01-20, by Martin von Zweigbergk
filemerge: always define a "base" label
2022-01-20, by Martin von Zweigbergk
filemerge: set default labels a little earlier
2022-01-20, by Martin von Zweigbergk
helptext: add missing newline to Rust helptext
stable
2022-01-18, by Raphaël Gomès
unamend: error out when running on merge commit
stable
2022-01-24, by Martin von Zweigbergk
tests: demonstrate how `hg unamend` fails on merge commits
stable
2022-01-24, by Martin von Zweigbergk
filemerge: remove unused arguments from `_merge()`
2022-01-20, by Martin von Zweigbergk
simplemerge: take arguments as annotated context objects
2022-01-20, by Martin von Zweigbergk
filemerge: make `labels` a required arg for `_premerge()`
2022-01-20, by Martin von Zweigbergk
filemerge: remove unnecessary check for empty string
2022-01-20, by Martin von Zweigbergk
tests: also test spaces in conflict marker labels
2022-01-20, by Martin von Zweigbergk
blackbox: change year in logs to ISO 8601 format
2022-01-17, by Valentin Gatien-Baron
blackbox: add milliseconds to blackbox logs by default
2022-01-17, by Valentin Gatien-Baron
blackbox: correct date format doc
2022-01-17, by Valentin Gatien-Baron
revlog: fix a bug where transaction can be aborted partially
stable
2022-01-20, by Arseniy Alekseyev
revlog: demonstrate a bug where transaction can be aborted partially
stable
2022-01-20, by Arseniy Alekseyev
branching: merge with stable
2022-01-18, by Raphaël Gomès
rust: fix build errors on darwin
stable
2021-12-30, by Dan Villiom Podlaski Christiansen
rust: Fix outdated comments in OwningDirstateMap
2022-01-17, by Simon Sapin
merge: consider the file merged when using :merge-{local,other}
2022-01-14, by Martin von Zweigbergk
simplemerge: delete unused exception class `CantReprocessAndShowBase`
2022-01-14, by Martin von Zweigbergk
simplemerge: change _minimize() to minimize a single conflict
2022-01-11, by Martin von Zweigbergk
simplemerge: make minimize() a free function
2022-01-11, by Martin von Zweigbergk
simplemerge: simplify and rename `render_markers()`
2022-01-11, by Martin von Zweigbergk
simplemerge: split out function for rendering :merge3 conflict markers
2022-01-11, by Martin von Zweigbergk
simplemerge: move default labels to simplemerge extension
2022-01-07, by Martin von Zweigbergk
simplemerge: use same newline detection for :mergediff as for :merge[3]
2022-01-07, by Martin von Zweigbergk
simplemerge: clarify names of functions that render conflict markers
2022-01-11, by Martin von Zweigbergk
simplemerge: make merge_lines() a free function
2022-01-07, by Martin von Zweigbergk
simplemerge: convert `merge_lines()` away from generator
2022-01-07, by Martin von Zweigbergk
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
2021-12-14, by Martin von Zweigbergk
less
more
|
(0)
-30000
-10000
-3000
-1000
-300
-100
-50
-32
+32
+50
+100
+300
+1000
+3000
tip