Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
merge: don't check for unknown files in IMM
|
changeset |
files
|
Fri, 13 Oct 2017 14:08:14 -0700 |
Jun Wu |
rebase: enable multidest by default
|
changeset |
files
|
Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
overlayworkingctx: make clean() public
|
changeset |
files
|
Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
overlayworkingctx: remove flushall()
|
changeset |
files
|
Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: skip subrepo state, update hooks, and updating the dirstate in IMM
|
changeset |
files
|
Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: remove calls to flushall()
|
changeset |
files
|
Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
|
changeset |
files
|
Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
context: switch ctx() use to changectx()
|
changeset |
files
|