| 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 |