Mercurial
Mercurial
>
hg-stable
/ shortlog
summary
| shortlog |
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
files
|
help
(0)
-30000
-10000
-3000
-1000
-300
-100
-30
-10
-8
+8
+10
+30
+100
+300
+1000
+3000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Tue, 18 Jan 2022 14:57:15 -0800
Martin von Zweigbergk
rebase: set custom conflict label for base commit
changeset
|
files
Thu, 20 Jan 2022 11:06:52 -0800
Martin von Zweigbergk
simplemerge: take over formatting of label from `filemerge`
changeset
|
files
Thu, 20 Jan 2022 16:16:05 -0800
Martin von Zweigbergk
filemerge: pass `simplemerge.MergeInput` to tool functions
changeset
|
files
Thu, 20 Jan 2022 14:42:50 -0800
Martin von Zweigbergk
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
changeset
|
files
Thu, 20 Jan 2022 14:13:12 -0800
Martin von Zweigbergk
filemerge: always define a "base" label
changeset
|
files
Thu, 20 Jan 2022 13:43:43 -0800
Martin von Zweigbergk
filemerge: set default labels a little earlier
changeset
|
files
Thu, 20 Jan 2022 11:17:09 -0800
Martin von Zweigbergk
filemerge: remove unused arguments from `_merge()`
changeset
|
files
Thu, 20 Jan 2022 11:00:30 -0800
Martin von Zweigbergk
simplemerge: take arguments as annotated context objects
changeset
|
files
(0)
-30000
-10000
-3000
-1000
-300
-100
-30
-10
-8
+8
+10
+30
+100
+300
+1000
+3000
tip