Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
(0)
-3000
-1000
-300
-100
-30
-10
-1
+1
+10
+30
+100
+300
+1000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Thu, 11 Jan 2018 18:36:05 +0530
evolve: use better words in conflict markers of `hg evolve`
changeset
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 11 Jan 2018 18:36:05 +0530] rev 3395
evolve: use better words in conflict markers of `hg evolve` Though we call merge.graft internally, we still have the functionality to pass the words we want to show up in conflict markers. So let's use better words here.
(0)
-3000
-1000
-300
-100
-30
-10
-1
+1
+10
+30
+100
+300
+1000
tip