Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
changeset |
files
|
Fri, 10 Jan 2020 14:17:56 -0800 |
Martin von Zweigbergk |
rebase: stop relying on having two parents to resume rebase
|
changeset |
files
|
Tue, 28 Jan 2020 21:49:50 -0800 |
Martin von Zweigbergk |
graphlog: use '%' for other context in merge conflict
|
changeset |
files
|
Wed, 29 Jan 2020 14:42:54 -0800 |
Martin von Zweigbergk |
tests: add `hg log -G` output when there are merge conflicts
|
changeset |
files
|
Wed, 29 Jan 2020 11:30:35 -0800 |
Martin von Zweigbergk |
revset: add a revset for parents in merge state
|
changeset |
files
|
Fri, 10 Jan 2020 17:46:10 -0800 |
Martin von Zweigbergk |
tests: add test of rebase with conflict in merge commit
|
changeset |
files
|
Thu, 16 Jan 2020 00:03:19 -0800 |
Martin von Zweigbergk |
rebase: always be graft-like, not merge-like, also for merges
|
changeset |
files
|
Wed, 15 Jan 2020 15:51:01 +0100 |
Pierre-Yves David |
nodemap: update the index with the newly written data (when appropriate)
|
changeset |
files
|