Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ shortlog
summary
| shortlog |
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
(0)
-3000
-1000
-300
-100
-12
+12
+100
+300
+1000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
2018-06-07
Pulkit Goyal
evolve: factor out logic to merge content divergent csets in separate fn
changeset
|
files
2018-06-07
Pulkit Goyal
evolve: commit the transaction if conflicts occur while merging content-div
changeset
|
files
2018-06-07
Pulkit Goyal
tests: add tests for resolving content-divergence when different parents
changeset
|
files
2018-06-01
Pulkit Goyal
evolve: implement resolution of content-divergence when on differet parents
changeset
|
files
2018-06-01
Pulkit Goyal
tests: add tests for resolving content-divergence with parent change
changeset
|
files
2018-06-05
Pulkit Goyal
CHANGELOG: add an entry about fixing issue5877
changeset
|
files
2018-06-05
Pulkit Goyal
evolve: pop up editor if conflicts occur while merging commit messages
changeset
|
files
2018-06-03
Pulkit Goyal
evolve: merge commit messages while resolving content-divergence (issue5877)
changeset
|
files
2018-06-05
Pulkit Goyal
evolve: move if-else block under the right block
changeset
|
files
2018-06-05
Pulkit Goyal
tests: make sure we don't result in commit messages conflict
changeset
|
files
2018-06-05
Pulkit Goyal
tests: don't use mkcommit shell function in test-divergent.t
changeset
|
files
2018-06-06
Pierre-Yves David
evolve: remove duplicated documentation
changeset
|
files
Loading...
(0)
-3000
-1000
-300
-100
-12
+12
+100
+300
+1000
tip