Mercurial > hg-stable
graph
-
shelve: attempt to make merge labels more helpfulFri, 21 Jan 2022 13:49:11 -0800, by Martin von Zweigbergk
-
histedit: attempt to make merge labels more helpfulFri, 21 Jan 2022 13:48:18 -0800, by Martin von Zweigbergk
-
update: set custom conflict label for base commitTue, 18 Jan 2022 13:23:49 -0800, by Martin von Zweigbergk
-
merge: set custom conflict label for base commitTue, 18 Jan 2022 15:04:55 -0800, by Martin von Zweigbergk
-
rebase: set custom conflict label for base commitTue, 18 Jan 2022 14:57:15 -0800, by Martin von Zweigbergk
-
simplemerge: take over formatting of label from `filemerge`Thu, 20 Jan 2022 11:06:52 -0800, by Martin von Zweigbergk
-
filemerge: pass `simplemerge.MergeInput` to tool functionsThu, 20 Jan 2022 16:16:05 -0800, by Martin von Zweigbergk
-
filemerge: work with `simplemerge.MergeInput` in `filemerge()`Thu, 20 Jan 2022 14:42:50 -0800, by Martin von Zweigbergk
-
filemerge: always define a "base" labelThu, 20 Jan 2022 14:13:12 -0800, by Martin von Zweigbergk
-
filemerge: set default labels a little earlierThu, 20 Jan 2022 13:43:43 -0800, by Martin von Zweigbergk
-
filemerge: remove unused arguments from `_merge()`Thu, 20 Jan 2022 11:17:09 -0800, by Martin von Zweigbergk
-
simplemerge: take arguments as annotated context objectsThu, 20 Jan 2022 11:00:30 -0800, by Martin von Zweigbergk
-
filemerge: make `labels` a required arg for `_premerge()`Thu, 20 Jan 2022 09:04:39 -0800, by Martin von Zweigbergk
-
filemerge: remove unnecessary check for empty stringThu, 20 Jan 2022 14:46:16 -0800, by Martin von Zweigbergk
-
tests: also test spaces in conflict marker labelsThu, 20 Jan 2022 23:07:35 -0800, by Martin von Zweigbergk
-
blackbox: change year in logs to ISO 8601 formatMon, 17 Jan 2022 21:20:46 -0500, by Valentin Gatien-Baron
-
blackbox: add milliseconds to blackbox logs by defaultMon, 17 Jan 2022 21:00:33 -0500, by Valentin Gatien-Baron
-
blackbox: correct date format docMon, 17 Jan 2022 20:47:46 -0500, by Valentin Gatien-Baron
-
branching: merge with stableTue, 18 Jan 2022 10:27:13 +0100, by Raphaël Gomès
-
rust: Fix outdated comments in OwningDirstateMapMon, 17 Jan 2022 12:50:13 +0100, by Simon Sapin
-
merge: consider the file merged when using :merge-{local,other}Fri, 14 Jan 2022 09:28:44 -0800, by Martin von Zweigbergk
-
simplemerge: delete unused exception class `CantReprocessAndShowBase`Fri, 14 Jan 2022 08:44:36 -0800, by Martin von Zweigbergk
-
simplemerge: change _minimize() to minimize a single conflictTue, 11 Jan 2022 22:13:56 -0800, by Martin von Zweigbergk
-
simplemerge: make minimize() a free functionTue, 11 Jan 2022 22:03:55 -0800, by Martin von Zweigbergk
-
simplemerge: simplify and rename `render_markers()`Tue, 11 Jan 2022 21:56:27 -0800, by Martin von Zweigbergk
-
simplemerge: split out function for rendering :merge3 conflict markersTue, 11 Jan 2022 16:23:10 -0800, by Martin von Zweigbergk
-
simplemerge: move default labels to simplemerge extensionFri, 07 Jan 2022 23:29:19 -0800, by Martin von Zweigbergk
-
simplemerge: use same newline detection for :mergediff as for :merge[3]Fri, 07 Jan 2022 22:23:44 -0800, by Martin von Zweigbergk
-
simplemerge: clarify names of functions that render conflict markersTue, 11 Jan 2022 16:54:42 -0800, by Martin von Zweigbergk
-
simplemerge: make merge_lines() a free functionFri, 07 Jan 2022 22:16:22 -0800, by Martin von Zweigbergk
-
simplemerge: convert `merge_lines()` away from generatorFri, 07 Jan 2022 18:42:31 -0800, by Martin von Zweigbergk
-
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labelsTue, 14 Dec 2021 13:12:56 -0800, by Martin von Zweigbergk
-
rust: upgrade `rand*` cratesFri, 14 Jan 2022 10:25:45 -0800, by Martin von Zweigbergk
-
logcmdutil: raise `StateError` when file to follow doesn't existThu, 06 Jan 2022 22:09:40 -0800, by Martin von Zweigbergk
-
logcmdutil: raise `InputError` on bad CLI argumentsThu, 06 Jan 2022 22:03:21 -0800, by Martin von Zweigbergk
-
tests: support pygments 2.11 (issue6628)Sun, 09 Jan 2022 13:35:30 +0100, by Cédric Krier
-
exchange: add fast path for subrepo check on pushMon, 03 Jan 2022 01:09:56 +0100, by Joerg Sonnenberger
-
simplemerge: rewrite `merge_lines()` using `merge_groups()`Wed, 05 Jan 2022 11:34:54 -0800, by Martin von Zweigbergk
-
simplemerge: make merge_groups() yield only 2-tuplesThu, 06 Jan 2022 09:03:17 -0800, by Martin von Zweigbergk
-
rhg: desambiguate status without decompressing filelog if possibleFri, 07 Jan 2022 14:40:21 +0100, by Simon Sapin
-
filelog: add a comment explaining a fast path in filerevisioncopied()Thu, 06 Jan 2022 12:46:10 +0100, by Simon Sapin
-
rhg: Store p1, p2, and hash in RevlogEntryTue, 21 Dec 2021 21:26:14 +0100, by Simon Sapin
-
rhg: RevlogEntry::uncompressed_len is signedTue, 21 Dec 2021 21:23:46 +0100, by Simon Sapin
-
rhg: Expose FilelogEntry that wraps RevlogEntryTue, 21 Dec 2021 18:50:44 +0100, by Simon Sapin
-
rhg: Add RevlogEntry::data that does delta resolutionTue, 21 Dec 2021 18:35:58 +0100, by Simon Sapin
-
rhg: Rename some revlog-related types and methodsTue, 21 Dec 2021 15:57:30 +0100, by Simon Sapin
-
git: add opener attribute to gitstoreWed, 05 Jan 2022 13:36:05 -0500, by Augie Fackler
-
branching: merge stable into defaultThu, 06 Jan 2022 09:55:28 +0100, by Raphaël Gomès
-
dirstate: remove deprecated APIThu, 23 Dec 2021 14:49:28 +0100, by Raphaël Gomès
-
discovery: remove deprecated APIThu, 23 Dec 2021 14:49:05 +0100, by Raphaël Gomès
-
revlog: remove deprecated APIsThu, 23 Dec 2021 14:48:31 +0100, by Raphaël Gomès
-
urls: remove deprecated APIsThu, 23 Dec 2021 14:47:52 +0100, by Raphaël Gomès
-
remotefilelog: remove deprecated APIThu, 23 Dec 2021 14:47:33 +0100, by Raphaël Gomès
-
exchangev2: remove itTue, 07 Dec 2021 16:44:22 +0100, by Raphaël Gomès
-
rust: fix build errors on darwinThu, 30 Dec 2021 13:25:44 +0100, by Dan Villiom Podlaski Christiansen
-
merge: with stableTue, 04 Jan 2022 14:21:22 -0500, by Augie Fackler