Mercurial > hg-stable
graph
-
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